diff --git a/defaults/main.yml b/defaults/main.yml
index 7898407..eaba2f6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -42,7 +42,6 @@ system_base_softwares_arch:
   - 'unrar' 
   - 'git-lfs'
 
-<<<<<<< HEAD
 system_base_softwares_debian:
   - 'zsh'
   - 'stow'
@@ -73,8 +72,4 @@ system_base_softwares_debian:
   - 'unrar' 
   - 'git-lfs'
 
-
-=======
-
 system_upgrade: false
->>>>>>> master