diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb
index 3ca5d3eb..8d33505c 100644
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -79,11 +79,7 @@ class Origami::MasterController < BaseOrigamiController
         payment_for = true
       end
       sale_payment = SalePayment.new
-<<<<<<< HEAD
       @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "master",ref_no,payment_for)
-=======
-      @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "master",ref_no)
->>>>>>> 043a1efb2a59c3793b56184a342ba6d132cf57f9
     end
   end