diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index 8e39046c923..0d0b12fbf18 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -76,16 +76,10 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
 
 		// Update paid amount on return/debit note creation
 		if (
-<<<<<<< HEAD
-			this.frm.doc.doctype === "Purchase Invoice"
-			&& this.frm.doc.is_return
-			&& (this.frm.doc.grand_total > this.frm.doc.paid_amount)
-=======
 			this.frm.doc.doctype === "Purchase Invoice" &&
 			this.frm.doc.is_return &&
 			this.frm.doc.grand_total < 0 &&
 			this.frm.doc.grand_total > this.frm.doc.paid_amount
->>>>>>> dcbcc596f2 (fix: Set paid amount automatically only if return entry validated and has negative grand total (#49829))
 		) {
 			this.frm.doc.paid_amount = flt(this.frm.doc.grand_total, precision("grand_total"));
 		}