diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index af1e57e6..a5b38db2 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -192,11 +192,7 @@ class Origami::PaymentsController < BaseOrigamiController
         end
 
         #card_balance amount for Paymal payment
-<<<<<<< HEAD
         card_balance_amount,transaction_ref = SaleAudit.getCardBalanceAmount(sale_id)
-=======
-        card_balance_amount, transaction_ref = SaleAudit.getCardBalanceAmount(sale_id)
->>>>>>> 60af9124bb181c662358624e1e6fbee1be36a2bb
 
         # get printer info
         print_settings = PrintSetting.find_by_unique_code(unique_code)