diff --git a/src/python/WMComponent/RetryManager/Modifier/BaseModifier.py b/src/python/WMComponent/RetryManager/Modifier/BaseModifier.py
index 377964d8c00..b38681a12c5 100644
--- a/src/python/WMComponent/RetryManager/Modifier/BaseModifier.py
+++ b/src/python/WMComponent/RetryManager/Modifier/BaseModifier.py
@@ -62,6 +62,7 @@ def updateSandbox(self, jobPKL, workload): # Not using workload?
         tempDir.cleanup()
         return
         
+<<<<<<< HEAD
     def getTask(self, jobPKL):
         """
         _getTask_
@@ -70,11 +71,18 @@ def getTask(self, jobPKL):
         task = jobPKL['task']
         return task
     
+=======
+
+>>>>>>> 9658b9cb711aa8a6c2e83b7b3c2049277dc491f6
     def getWorkload(self, jobPKL):
         """
         _getWorkload_
 
+<<<<<<< HEAD
 
+=======
+        
+>>>>>>> 9658b9cb711aa8a6c2e83b7b3c2049277dc491f6
         """
         pklPath = jobPKL['spec']
 
diff --git a/src/python/WMComponent/RetryManager/Modifier/MemoryModifier.py b/src/python/WMComponent/RetryManager/Modifier/MemoryModifier.py
index 470c628fe38..d85fde02fef 100644
--- a/src/python/WMComponent/RetryManager/Modifier/MemoryModifier.py
+++ b/src/python/WMComponent/RetryManager/Modifier/MemoryModifier.py
@@ -33,11 +33,15 @@ def changeSandbox(self, jobPKL, newMemory):
 
         for task in workHelper.getAllTasks():
             task.setMaxPSS(newMemory)
+<<<<<<< HEAD
             
+=======
+>>>>>>> 9658b9cb711aa8a6c2e83b7b3c2049277dc491f6
 
         self.setWorkload(workload, jobPKL)
 
         return
+<<<<<<< HEAD
     
     def changeMemoryForTask(self, jobPKL, newMemory):
         """
@@ -45,6 +49,8 @@ def changeMemoryForTask(self, jobPKL, newMemory):
         """
         task = self.getTask(jobPKL)
         task.setMaxPSS(newMemory)
+=======
+>>>>>>> 9658b9cb711aa8a6c2e83b7b3c2049277dc491f6
 
     def changeJobPkl(self, pklFile, jobPKL, newMemory):
         """
@@ -88,7 +94,11 @@ def changeMemory(self, job, settings):
         newMemory = self.getNewMemory(jobPKL, settings)
 
         self.changeJobPkl(pklFile, jobPKL, newMemory)
+<<<<<<< HEAD
         self.changeMemoryForTask(jobPKL, newMemory)
+=======
+        self.changeSandbox(jobPKL, newMemory)
+>>>>>>> 9658b9cb711aa8a6c2e83b7b3c2049277dc491f6
         logging.info('Old maxPSS: %d. New maxPSS: %d', job['estimatedMemoryUsage'], newMemory)
 
     def modifyJob(self, job):