diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 56af066..60caf0f 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -431,7 +431,4 @@
 erpnext.patches.v8_5.update_customer_group_in_POS_profile
 erpnext.patches.v8_6.update_timesheet_company_from_PO
 erpnext.patches.v8_6.set_write_permission_for_quotation_for_sales_manager
-<<<<<<< HEAD
-erpnext.patches.v8_5.remove_project_type_property_setter
-=======
->>>>>>> Set write permission to sales manger for permlevel 1 in Quotation doctype
+erpnext.patches.v8_5.remove_project_type_property_setter
\ No newline at end of file