diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index a6c223385a3..a89776250f2 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -2264,17 +2264,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 		}
 	},
 
-<<<<<<< HEAD
 	coupon_code: function() {
-		var me = this;
-		frappe.run_serially([
-			() => this.frm.doc.ignore_pricing_rule=1,
-			() => me.ignore_pricing_rule(),
-			() => this.frm.doc.ignore_pricing_rule=0,
-			() => me.apply_pricing_rule()
-		]);
-=======
-	coupon_code() {
 		if (this.frm.doc.coupon_code || this.frm._last_coupon_code) {
 			// reset pricing rules if coupon code is set or is unset
 			const _ignore_pricing_rule = this.frm.doc.ignore_pricing_rule;
@@ -2286,7 +2276,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 				() => this.frm._last_coupon_code = this.frm.doc.coupon_code
 			]);
 		}
->>>>>>> 81514516f3 (fix(pos): coupon code is applied even if ignore pricing rule is check)
 	}
 });