diff --git a/.drone.yml b/.drone.yml
index fd9783c..47daeb8 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -25,17 +25,10 @@ steps:
         from_secret: DOCKER_PASSWORD
   commands:
   - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-<<<<<<< HEAD
-  - docker build -t="$DOCKER_USERNAME/consumer" .
-  - docker build -t="$DOCKER_USERNAME/consumer:$DRONE_BUILD_NUMBER" .
-  - docker push "$DOCKER_USERNAME/consumer"
-  - docker push "$DOCKER_USERNAME/consumer:$DRONE_BUILD_NUMBER"
-=======
   - docker build -t="$DOCKER_USERNAME/consumer-scheduler" .
   - docker build -t="$DOCKER_USERNAME/consumer-scheduler:$DRONE_BUILD_NUMBER" .
   - docker push "$DOCKER_USERNAME/consumer-scheduler"
   - docker push "$DOCKER_USERNAME/consumer-scheduler:$DRONE_BUILD_NUMBER"
->>>>>>> 7972566edb8660d7ba3ee0dcc58ee8740922f62c
 
 - name: slack
   image: plugins/slack