diff --git a/src/DIRAC/WorkloadManagementSystem/Client/DownloadInputData.py b/src/DIRAC/WorkloadManagementSystem/Client/DownloadInputData.py
index d6c7e9581ce..3ded1d0eb8e 100644
--- a/src/DIRAC/WorkloadManagementSystem/Client/DownloadInputData.py
+++ b/src/DIRAC/WorkloadManagementSystem/Client/DownloadInputData.py
@@ -31,10 +31,6 @@ class DownloadInputData:
     #############################################################################
     def __init__(self, argumentsDict):
         """Standard constructor"""
-<<<<<<< HEAD
-=======
-        self.name = COMPONENT_NAME
->>>>>>> 7b851fb83 (fix: adding log headers to InputDataResolution modules)
         self.inputData = argumentsDict["InputData"]
         self.configuration = argumentsDict["Configuration"]
         self.jobID = self.configuration.get("JobID")
@@ -42,11 +38,7 @@ def __init__(self, argumentsDict):
         self.fileCatalogResult = argumentsDict["FileCatalog"]
         # By default put each input data file into a separate directory
         self.inputDataDirectory = argumentsDict.get("InputDataDirectory", "PerFile")
-<<<<<<< HEAD
 
-=======
-        
->>>>>>> 7b851fb83 (fix: adding log headers to InputDataResolution modules)
         self.log = gLogger.getSubLogger(f"[{self.jobID}]{self.__class__.__name__}")
         self.log.showHeaders(True)