diff --git a/tasks/config.yaml b/tasks/config.yaml
index 82b3ec2..2009671 100644
--- a/tasks/config.yaml
+++ b/tasks/config.yaml
@@ -39,10 +39,7 @@
 
     {% if debian_live_debian_installer is defined %}
     --debian-installer "{{ debian_live_debian_installer }}"
-<<<<<<< HEAD
     --debian-installer-gui "{{ live_build_debian_installer_gui | default(false) }}"
-=======
->>>>>>> b3ddf4d5d15d8494bd5a720b8835e4e587db7973
     {% if debian_nonfree_firmware %}
     --firmware-binary true
     {% endif %}