diff --git a/.woodpecker.yml b/.woodpecker.yml
index a6a97e2..b13b945 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -5,26 +5,4 @@ pipeline:
       - chmod +x gradlew
       - ./gradlew assemble --stacktrace
     when:
-<<<<<<< HEAD
       event: push
-
-  rebuild-cache-with-filesystem:
-    image: bash
-    commands:
-      - ls -a
-      - mkdir -p /tmp/woodpecker/Elixium/Raxen/build
-      - ls -a /tmp/woodpecker/Elixium/Raxen
-      - cp -f -R $(pwd)/build/classes /tmp/woodpecker/Elixium/Raxen/build/classes
-      - cp -f -R $(pwd)/build/generated /tmp/woodpecker/Elixium/Raxen/build/generated
-      - cp -f -R $(pwd)/build/resources /tmp/woodpecker/Elixium/Raxen/build/resources
-      - cp -f -R $(pwd)/build/tmp /tmp/woodpecker/Elixium/Raxen/build/tmp
-      - cp -f -R $(pwd)/.gradle /tmp/woodpecker/Elixium/Raxen
-      - ls -a
-      - ls -a /tmp/woodpecker/Elixium/Raxen
-    volumes:
-      - /tmp/woodpecker/Elixium/Raxen:/tmp/woodpecker/Elixium/Raxen
-    when:
-      event: push
-=======
-      event: push
->>>>>>> ee3b04c18d219c80d017553a4f3d028e8ff505d0