fix: conflicts

erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py

@@ -9,6 +9,7 @@ import frappe
 from frappe import _, bold
 from frappe.model.document import Document
 from frappe.utils import date_diff, flt, formatdate, get_datetime, get_last_day, getdate
+from six import string_types
 
 
 class LeavePolicyAssignment(Document):