diff --git a/.drone.yml b/.drone.yml
index 449022c..79a43f1 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -33,48 +33,7 @@ steps:
 #   when:
 #     status:
 #     - success
-<<<<<<< HEAD
 
-=======
-
-- name: running
-  image: jekyll/jekyll:latest
-  settings:
-    TZ: Europe/Amsterdam
-    port: 4000
-    script:
-      - jekyll serve --force_polling
-  when:
-    status:
-    - success
-
-  # website:
-  #   image: jekyll/jekyll:latest
-  #   container_name: website
-  #   hostname: website
-  #   command: jekyll serve --force_polling
-  #   network_mode: SWAG
-  #   environment:
-  #     - TZ=Europe/Amsterdam
-  #   restart: unless-stopped
-  #   volumes:
-  #     - /home/sthope/docker/website:/srv/jekyll
-  #     - /etc/localtime:/etc/localtime:ro
-  #     - /etc/timezone:/etc/timezone:ro
-  #     - website_cache:/srv/jekyll/.jekyll-cache
-  #     - website_site:/srv/jekyll/_site
-  #   labels:
-  #     - swag=enable
-  #     - swag_port=4000
-  #     - swag_proto=http
-  #     - swag_url=www.sthope.dev
-#      - swag_auth=authelia
-#      - swag_auth_bypass=/api,/otherfolder
-
-
-
-
->>>>>>> f7090510b1b31c9fbe921ebd9372fa91944c8531
 # - name: discord
 #   pull: always
 #   image: appleboy/drone-discord