diff --git a/.gitignore b/.gitignore
index 228a291..16bc502 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,9 +4,5 @@ crash.log
 kubeconfig.yaml
 kubeconfig.yaml-e
 terraform.tfvars
-<<<<<<< HEAD
-plans.yaml
-=======
 plans.yaml
 traefik_config.yaml
->>>>>>> k3s-install