diff --git a/.woodpecker/.make-app.yaml b/.woodpecker/.make-app.yaml
index 328f739..432c3ac 100644
--- a/.woodpecker/.make-app.yaml
+++ b/.woodpecker/.make-app.yaml
@@ -43,15 +43,9 @@ steps:
       password:
         from_secret: gitea_passwd
       debug: "true"
-<<<<<<< HEAD
-      owner: "plugins"
-      package_name: "dummy_package"
-      package_version: ${CI_COMMIT_TAG}
-=======
       owner: "iHackFX"
       package_name: "library"
       package_version: "0.1.0"
->>>>>>> test-woodpecker
       file_source: "./android/app/build/outputs/apk/debug/app-debug.apk"
       file_name: "app-debug.apk"
       update: "true"