diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 3905215..d300285 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -488,9 +488,6 @@
 erpnext.patches.v10_0.fichier_des_ecritures_comptables_for_france
 erpnext.patches.v10_0.update_assessment_plan
 erpnext.patches.v10_0.update_assessment_result
-<<<<<<< HEAD
 erpnext.patches.v10_0.added_extra_gst_custom_field
 erpnext.patches.v10_0.workflow_leave_application #2018-01-24
-=======
 erpnext.patches.v10_0.set_default_payment_terms_based_on_company
->>>>>>> master