diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index 4fdf8a7a3f2..7452fc380aa 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -2,14 +2,9 @@
 # License: GNU General Public License v3. See license.txt
 
 
-<<<<<<< HEAD
 import json
 import unittest
 from collections import defaultdict
-=======
-from cmath import pi
-from turtle import update
->>>>>>> 683a47f7a1 (fix: consider sales rate as incoming rate for transit warehouse in purchase flow)
 
 import frappe
 from frappe.tests.utils import FrappeTestCase, change_settings