diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index b134e79a137..949b7a6be56 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -2026,7 +2026,11 @@ class AccountsController(TransactionBase):
 									discount_amount * self.get("conversion_rate"),
 									item.precision("discount_amount"),
 								),
+<<<<<<< HEAD
 								dr_or_cr + "_in_account_currency": flt(
+=======
+								"debit_in_transaction_currency": flt(
+>>>>>>> e41a7b8cd7 (fix(accounts): populate correct fields on GL Entry during discount accounting)
 									discount_amount, item.precision("discount_amount")
 								),
 								"cost_center": item.cost_center,
@@ -2047,7 +2051,11 @@ class AccountsController(TransactionBase):
 									discount_amount * self.get("conversion_rate"),
 									item.precision("discount_amount"),
 								),
+<<<<<<< HEAD
 								rev_dr_cr + "_in_account_currency": flt(
+=======
+								"credit_in_transaction_currency": flt(
+>>>>>>> e41a7b8cd7 (fix(accounts): populate correct fields on GL Entry during discount accounting)
 									discount_amount, item.precision("discount_amount")
 								),
 								"cost_center": item.cost_center,