diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index 0de7af08692..a407f90b51f 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -1773,60 +1773,16 @@ class TestSalesInvoice(FrappeTestCase):
 
 		self.assertTrue(gle)
 
-<<<<<<< HEAD
 	def test_invoice_exchange_rate(self):
-=======
-	def test_gle_in_transaction_currency(self):
-		# create multi currency sales invoice with 2 items with same income account
->>>>>>> e8a66d03bc (fix: do not validate if conversion rate is 1 for different currency)
 		si = create_sales_invoice(
 			customer="_Test Customer USD",
 			debit_to="_Test Receivable USD - _TC",
 			currency="USD",
-<<<<<<< HEAD
 			conversion_rate=1,
 			do_not_save=1,
 		)
 
 		self.assertRaises(frappe.ValidationError, si.save)
-=======
-			conversion_rate=50,
-			do_not_submit=True,
-		)
-		# add 2nd item with same income account
-		si.append(
-			"items",
-			{
-				"item_code": "_Test Item",
-				"qty": 1,
-				"rate": 80,
-				"income_account": "Sales - _TC",
-				"cost_center": "_Test Cost Center - _TC",
-			},
-		)
-		si.submit()
-
-		gl_entries = frappe.db.sql(
-			"""select transaction_currency, transaction_exchange_rate,
-			debit_in_transaction_currency, credit_in_transaction_currency
-			from `tabGL Entry`
-			where voucher_type='Sales Invoice' and voucher_no=%s and account = 'Sales - _TC'
-			order by account asc""",
-			si.name,
-			as_dict=1,
-		)
-
-		expected_gle = {
-			"transaction_currency": "USD",
-			"transaction_exchange_rate": 50,
-			"debit_in_transaction_currency": 0,
-			"credit_in_transaction_currency": 180,
-		}
-
-		for gle in gl_entries:
-			for field in expected_gle:
-				self.assertEqual(expected_gle[field], gle[field])
->>>>>>> e8a66d03bc (fix: do not validate if conversion rate is 1 for different currency)
 
 	def test_invalid_currency(self):
 		# Customer currency = USD