diff --git a/test/unit/dispatcher/commands/execute.spec.js b/test/unit/dispatcher/commands/execute.spec.js
index 6c4b18ae5a03482d009a00ffa1401146816b2ba8..29ae4e7616e6e695d9741fb3be8115eee210cc32 100644
--- a/test/unit/dispatcher/commands/execute.spec.js
+++ b/test/unit/dispatcher/commands/execute.spec.js
@@ -485,7 +485,7 @@ describe('executing commands', () => {
     })
   })
 
-  describe.only('BAN command', () => {
+  describe('BAN command', () => {
     const messageId = 1312
     let isBannedStub, findMemberPhoneNumberStub, banMemberStub
     beforeEach(() => {
diff --git a/test/unit/dispatcher/index.spec.js b/test/unit/dispatcher/index.spec.js
index 657eedcc75855ca2194ae737a6bb528b0ff7b38a..90fbcdf8df30cc8139b2efaad1e2d1c4a8931489 100644
--- a/test/unit/dispatcher/index.spec.js
+++ b/test/unit/dispatcher/index.spec.js
@@ -97,11 +97,8 @@ describe('dispatcher module', () => {
     processCommandStub,
     dispatchStub,
     enqueueResendStub,
-<<<<<<< HEAD
-    respondToHealthcheckStub
-=======
+    respondToHealthcheckStub,
     isBannedStub
->>>>>>> index rewrite and tests
 
   before(async () => await app.run(testApp))
 
@@ -111,13 +108,11 @@ describe('dispatcher module', () => {
 
     findDeepStub = sinon.stub(channelRepository, 'findDeep').returns(Promise.resolve(channels[0]))
 
-<<<<<<< HEAD
     respondToHealthcheckStub = sinon
       .stub(diagnostics, 'respondToHealthcheck')
       .returns(Promise.resolve('42'))
-=======
+
     isBannedStub = sinon.stub(banRepository, 'isBanned').returns(Promise.resolve(false))
->>>>>>> index rewrite and tests
 
     resolveMemberTypeStub = sinon
       .stub(membershipRepository, 'resolveMemberType')