diff --git a/vars/default_vars.yml b/vars/default_vars.yml
index 01a15c72a..ac666d5a3 100644
--- a/vars/default_vars.yml
+++ b/vars/default_vars.yml
@@ -158,8 +158,6 @@ wan_nameserver:
 
 # 2-COMMON
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 # 3-BASE-SERVER
 
 # roles/httpd (Apache configuration) runs here
@@ -170,34 +168,6 @@ apache_allow_sudo: True
 # For schools that use WordPress and/or Moodle intensively. See iiab/iiab #1147
 # WARNING: Enabling this (might) cause excess use of RAM or other resources?
 apache_high_php_limits: False
-=======
-   # Intended for developers: ONLY CHANGE THESE IF YOU KNOW WHAT YOU ARE DOING
-   # The following 2 override the detection when not "auto"
-   user_wan_iface: auto
-   user_lan_iface: auto
-   wan_ip: dhcp
-   wan_netmask:
-   wan_gateway:
-   wan_nameserver:
-   # exFAT is auto-enabled for all "debuntu" OS's as of Nov 2017, in roles/2-common/tasks/packages.yml#L35-L36
-   # exFAT_enabled: True
-
-   # Parameters by Aggregate Roles
-   # Each Role must have the following variables which are either True or False:
-   #   <role-name>_install
-   #   <role-name>_enabled
->>>>>>> da77e233... add in template dir
-
-   # Our past convention was to install everything in all aggregates
-   # And to enable everything in 1-PREP, 2-COMMON, and 3-BASE-SERVER
-=======
-# 3-BASE-SERVER
->>>>>>> ce391f0a... bring in clean defaults and py
-
-# Make this False to disable http://box/common/services/power_off.php button:
-allow_apache_sudo: True
-
-# roles/httpd runs here
 
 # roles/iiab-admin runs here