diff --git a/src/ui/templates/settings_plugins.html b/src/ui/templates/settings_plugins.html
index d58286cec..294eff557 100644
--- a/src/ui/templates/settings_plugins.html
+++ b/src/ui/templates/settings_plugins.html
@@ -175,20 +175,7 @@ data-plugin-item="{{plugin['id']}}"
         data-default-value="{{global_config[setting]['value']}}" {% if
         setting in ["AUTOCONF_MODE", "SWARM_MODE", "KUBERNETES_MODE"] or global_config[setting]['method'] != 'ui' and global_config[setting]['method']
         != 'default' %} disabled {% endif %} 
-<<<<<<< Updated upstream
-        
 
-        {% if
-          setting in ["AUTOCONF_MODE", "SWARM_MODE", "KUBERNETES_MODE"] or global_config[setting]['method'] != 'ui' and global_config[setting]['method']
-          != 'default' %}
-          {% if global_config[setting]['value'] == "yes" %}     checked    {% endif %}
-        {% endif %}
-
-        id="checkbox-{{value['id']}}" class="cursor-pointer disabled:cursor-default 
-        relative dark:border-slate-600 dark:bg-slate-700 z-10 checked:z-0 w-5 h-5 ease
-        text-base rounded-1.4 checked:bg-primary checked:border-primary
-        dark:checked:bg-primary dark:checked:border-primary duration-250 float-left
-=======
         aria-checked="{% if global_config[setting]['value'] == "yes" %}true{% else %}false{% endif %}"
           checked  
         id="checkbox-{{value['id']}}" 
@@ -196,7 +183,6 @@ data-plugin-item="{{plugin['id']}}"
         relative dark:border-slate-600 dark:bg-slate-700 z-10 aria-checked:z-0 w-5 h-5 ease
         text-base rounded-1.4 aria-checked:bg-primary aria-checked:border-primary
         dark:aria-checked:bg-primary dark:aria-checked:border-primary duration-250 float-left
->>>>>>> Stashed changes
         mt-1 appearance-none border border-gray-300 bg-white bg-contain bg-center
         bg-no-repeat align-top transition-all disabled:bg-gray-400
         disabled:border-gray-400 dark:disabled:bg-gray-800