diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index f9197851fad..b3ef8e23985 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -1556,17 +1556,12 @@ class SalesInvoice(SellingController):
 				)
 
 	def update_project(self):
-<<<<<<< HEAD
-		if self.project:
-			project = frappe.get_doc("Project", self.project)
-=======
 		unique_projects = list(set([d.project for d in self.get("items") if d.project]))
 		if self.project and self.project not in unique_projects:
 			unique_projects.append(self.project)
 
 		for p in unique_projects:
 			project = frappe.get_doc("Project", p)
->>>>>>> 7de9c14a2c (fix: incorrect Gross Margin on project (#44461))
 			project.update_billed_amount()
 			project.db_update()