diff --git a/.drone.yml b/.drone.yml
index 83df60d..efdf2cb 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,18 +3,10 @@ name: default
 
 steps:
   - name: build
-<<<<<<< HEAD
     image: hugo
     commands:
       - wget https://github.com/gohugoio/hugo/releases/download/v0.62.1/hugo_0.62.1_Linux-64bit.deb -O hugo.deb
       - dpkg -i hugo.deb
-=======
-    image: ruby
-    commands:
-      - gem install bundler
-      - bundle install
-      - bundle exec jekyll build
->>>>>>> upstream/master
   
   - name: docker
     image: plugins/docker