diff --git a/.gitignore b/.gitignore
index 6c2542f..b99dd72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,11 @@ crash.log
 kubeconfig.yaml
 kubeconfig.yaml-e
 terraform.tfvars
+<<<<<<< HEAD
 plans-custom.yaml
 traefik-custom.yaml
 kured-custom.yaml
+=======
+plans.yaml
+traefik_config.yaml
+>>>>>>> 32d43b50f40b30cba207fb5946dee422825d93ef