diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml
index 5b8f253..00097b2 100644
--- a/.woodpecker/build.yml
+++ b/.woodpecker/build.yml
@@ -4,12 +4,9 @@ when:
     branch:
       - ${CI_REPO_DEFAULT_BRANCH}
       - renovate/*
-<<<<<<< HEAD:.woodpecker/build.yml
 
 depends_on:
   - lint
-=======
->>>>>>> main:.woodpecker.yml
 
 steps:
   # use vendor to cache dependencies