diff --git a/config/routes.rb b/config/routes.rb
index 0f54dea5..dd38914d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -100,8 +100,6 @@ Rails.application.routes.draw do
 
     get "/:id/request_bills" => "request_bills#print",:as => "request_bill"
     get '/:sale_id/reprint' => 'payments#reprint' ,:defaults => { :format => 'json' }
-<<<<<<< HEAD
-=======
 
     #---------Shift ---------------#
     resources :shifts, only: [:index, :new, :create, :edit]
@@ -117,7 +115,6 @@ Rails.application.routes.draw do
     #payment - Incoming payments - [accept all payment types (cash, other payments (except rebate))
     #payment - Outing payments - Cash only [ *Misc expeness tracking]
 
->>>>>>> 11c3be8f4a6b853a11b0e3f27e0fe60af75386d9
     #--------- Payment ------------#
     get 'sale/:sale_id/first_bill' => 'payments#first_bill', :defaults => { :format => 'json' }
     get 'sale/:sale_id/payment' => 'payments#show'