diff --git a/app/models/order.rb b/app/models/order.rb
index dde46bc1..54e02b83 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -273,10 +273,7 @@ class Order < ApplicationRecord
           left join sales on sales.sale_id = sale_orders.sale_id")
           .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to)
           .group("orders.order_id,order_items.order_items_id,dining_facilities.name,sales.receipt_no,bookings.booking_id,sales.sale_id")
-<<<<<<< HEAD
-=======
 
->>>>>>> f9c8dbc03eee1b539ce04480b411b1d761e570f4
   end
 
   private