diff --git a/lib/galaxy/managers/hdas.py b/lib/galaxy/managers/hdas.py
index babc630ba92..67960c005fc 100644
--- a/lib/galaxy/managers/hdas.py
+++ b/lib/galaxy/managers/hdas.py
@@ -165,10 +165,6 @@ class HDAManager( datasets.DatasetAssociationManager,
 
         if hda.creating_job_associations:
             job = hda.creating_job_associations[0].job
-<<<<<<< HEAD
-            job.mark_deleted( self.app.config.track_jobs_in_database )
-=======
->>>>>>> fix.history-purge
             if not job.finished:
                 # signal to stop the creating job
                 self.app.job_manager.job_stop_queue.put( job.id )