diff --git a/.woodpecker/namespace.yml b/.woodpecker/namespace.yml
index 32b50d0..eb79944 100644
--- a/.woodpecker/namespace.yml
+++ b/.woodpecker/namespace.yml
@@ -3,11 +3,7 @@ when:
   ref:
     exclude:
       - refs/tags/*-configchange
-<<<<<<< HEAD
-      
-=======
 
->>>>>>> main
 steps:
   create_namespace:
     image: quay.io/wollud1969/k8s-admin-helper:0.3.4