diff --git a/erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py b/erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py
index 0ae368f9df4..fe96f3db4f2 100644
--- a/erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py
+++ b/erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py
@@ -8,12 +8,7 @@ from math import ceil
 import frappe
 from frappe import _, bold
 from frappe.model.document import Document
-<<<<<<< HEAD
-from frappe.utils import date_diff, flt, formatdate, get_datetime, getdate
-from six import string_types
-=======
 from frappe.utils import date_diff, flt, formatdate, get_datetime, get_last_day, getdate
->>>>>>> 25c7f850b1 (fix: earned leaves not allocated if assignment is created on month-end)
 
 
 class LeavePolicyAssignment(Document):