diff --git a/app/models/order.rb b/app/models/order.rb
index 27fa8247..a76159be 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -243,13 +243,10 @@ class Order < ApplicationRecord
                     .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id")
                     .joins("left join orders on orders.order_id = booking_orders.order_id")
                     .joins("left join sales on sales.sale_id = bookings.sale_id")
-<<<<<<< HEAD
-                    .where("sales.sale_status='complete'")
-                    .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.customer_id")
-=======
+
                     .where("sales.sale_status='completed'")
                     .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status")
->>>>>>> ca2dc181d62c8c15e0072d7ad01720fb19d28531
+
 
   end