diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index cde43f3..9146336 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -78,8 +78,5 @@
 erpnext.patches.v4_2.add_currency_turkish_lira #2014-08-08
 execute:frappe.delete_doc("DocType", "Landed Cost Wizard")
 erpnext.patches.v4_2.default_website_style
-<<<<<<< HEAD
 erpnext.patches.v4_2.set_company_country
-=======
 erpnext.patches.v4_2.update_sales_order_invoice_field_name
->>>>>>> Add patch for field name change in SI, rename email template