diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index ce324513951..7eb55272eb8 100755
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -87,11 +87,7 @@ class Task(NestedSet):
 		self.update_depends_on()
 		self.validate_dependencies_for_template_task()
 		self.validate_completed_on()
-<<<<<<< HEAD
-=======
-		self.set_default_end_date_if_missing()
 		self.validate_parent_is_group()
->>>>>>> ed1a1099cb (fix: validate is_group for parent task)
 
 	def validate_dates(self):
 		self.validate_from_to_dates("exp_start_date", "exp_end_date")
diff --git a/erpnext/projects/doctype/task/test_task.py b/erpnext/projects/doctype/task/test_task.py
index 0cb4348a2cb..bf5852834b2 100644
--- a/erpnext/projects/doctype/task/test_task.py
+++ b/erpnext/projects/doctype/task/test_task.py
@@ -6,12 +6,7 @@ import unittest
 import frappe
 from frappe.utils import add_days, getdate, nowdate
 
-<<<<<<< HEAD
-from erpnext.projects.doctype.task.task import CircularReferenceError
-=======
 from erpnext.projects.doctype.task.task import CircularReferenceError, ParentIsGroupError
-from erpnext.tests.utils import ERPNextTestSuite
->>>>>>> 291f0c7161 (test: add test for parent task is_group validation)
 
 
 class TestTask(unittest.TestCase):