diff --git a/lib/tasks/dial.js b/lib/tasks/dial.js
index 5de62233..f3a1504f 100644
--- a/lib/tasks/dial.js
+++ b/lib/tasks/dial.js
@@ -145,15 +145,9 @@ class TaskDial extends Task {
       if (this.epOther) this._installDtmfDetection(cs, this.epOther, this.parentDtmfCollector);
       await this._attemptCalls(cs);
       await this.awaitTaskDone();
-<<<<<<< HEAD
-      await this.performAction(this.results);
-      if (this.epOther) this._removeDtmfDetection(cs, this.epOther);
-=======
-
       this.logger.debug({callSid: this.cs.callSid}, 'Dial:exec task is done, sending actionHook if any');
       await this.performAction(this.results, this.killReason !== KillReason.Replaced);
       this._removeDtmfDetection(cs, this.epOther);
->>>>>>> 2b782bc... bugfix for enqueue and dial when these tasks are replaced by LCC
       this._removeDtmfDetection(cs, this.ep);
     } catch (err) {
       this.logger.error({err}, 'TaskDial:exec terminating with error');
@@ -163,12 +157,8 @@ class TaskDial extends Task {
 
   async kill(cs, reason) {
     super.kill(cs);
-<<<<<<< HEAD
-    if (this.epOther) this._removeDtmfDetection(this.cs, this.epOther);
-=======
     this.killReason = reason || KillReason.Hangup;
     this._removeDtmfDetection(this.cs, this.epOther);
->>>>>>> 2b782bc... bugfix for enqueue and dial when these tasks are replaced by LCC
     this._removeDtmfDetection(this.cs, this.ep);
     this._killOutdials();
     if (this.sd) {