diff --git a/lib/dl_file_uploader_task_interface/dl_file_uploader_task_interface/tasks.py b/lib/dl_file_uploader_task_interface/dl_file_uploader_task_interface/tasks.py
index 412fdbd35..682df4904 100644
--- a/lib/dl_file_uploader_task_interface/dl_file_uploader_task_interface/tasks.py
+++ b/lib/dl_file_uploader_task_interface/dl_file_uploader_task_interface/tasks.py
@@ -29,18 +29,8 @@ class DownloadGSheetTask(BaseTaskMeta):
 
 
 @attr.s
-<<<<<<< HEAD
-<<<<<<< HEAD
 class DownloadYaDocsTask(BaseTaskMeta):
     name = TaskName("download_yadocs")
-=======
-class DownloadYaDocumentsTask(BaseTaskMeta):
-    name = TaskName("download_yadocuments")
->>>>>>> 3774068a (Download yadocs task)
-=======
-class DownloadYaDocsTask(BaseTaskMeta):
-    name = TaskName("download_yadocs")
->>>>>>> ab5a41d1 (Fix issues)
 
     file_id: str = attr.ib()