diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py
index 1c2a1b9c753..a62ba2e3732 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -498,14 +498,7 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map, tot
 
 	for gle in gl_entries:
 		group_by_value = gle.get(group_by)
-<<<<<<< HEAD
 		gle.voucher_type = gle.voucher_type
-=======
-		gle.voucher_subtype = _(gle.voucher_subtype)
-		gle.against_voucher_type = _(gle.against_voucher_type)
-		gle.remarks = _(gle.remarks)
-		gle.party_type = _(gle.party_type)
->>>>>>> adb331ef71 (fix: revert #46900 - against_voucher filter in general ledger)
 
 		if gle.posting_date < from_date or (cstr(gle.is_opening) == "Yes" and not show_opening_entries):
 			if not group_by_voucher_consolidated: