fixed conflict

erpnext/patches.txt

@@ -1,3 +1,5 @@
+execute:import unidecode # new requirement
+
 erpnext.patches.4_0.validate_v3_patch
 erpnext.patches.4_0.update_user_properties
 erpnext.patches.4_0.move_warehouse_user_to_restrictions

erpnext/patches/4_0/countrywise_coa.py

@@ -23,4 +23,4 @@ def execute():
 		frappe.db.sql("""update `tabAccount` set balance_must_be=debit_or_credit 
 			where ifnull(allow_negative_balance, 0) = 0""")
 	except:
-		pass
+		pass

erpnext/patches/4_0/import_country_codes.py

@@ -3,11 +3,11 @@
 
 from __future__ import unicode_literals
 import frappe
+from frappe.country_info import get_all
+from erpnext.setup.install import import_country_and_currency
 
 def execute():
 	frappe.reload_doc("setup", "doctype", "country")
-
-	from frappe.country_info import get_all
-	
+	import_country_and_currency()
 	for name, country in get_all().iteritems():
 		frappe.set_value("Country", name, "code", country.get("code"))

erpnext/setup/install.py

@@ -23,13 +23,14 @@ def import_country_and_currency():
 	
 	for name in data:
 		country = frappe._dict(data[name])
-		frappe.doc({
-			"doctype": "Country",
-			"country_name": name,
-			"code": country.code,
-			"date_format": country.date_format or "dd-mm-yyyy",
-			"time_zones": "\n".join(country.timezones or [])
-		}).insert()
+		if not frappe.db.exists("Country", name):
+			frappe.doc({
+				"doctype": "Country",
+				"country_name": name,
+				"code": country.code,
+				"date_format": country.date_format or "dd-mm-yyyy",
+				"time_zones": "\n".join(country.timezones or [])
+			}).insert()
 		
 		if country.currency and not frappe.db.exists("Currency", country.currency):
 			frappe.doc({