diff --git a/tasks/apache2_template.yaml b/tasks/apache2_template.yaml
index b9a8b53..782874f 100644
--- a/tasks/apache2_template.yaml
+++ b/tasks/apache2_template.yaml
@@ -1,11 +1,7 @@
 ---
 - name: Write directory-based nextcloud.conf file
   ansible.builtin.template:
-<<<<<<< HEAD
-    src: dhcpd.conf.j2
-=======
     src: apache2_directory_nextcloud.conf.j2
->>>>>>> 46b6f98 (Fixed template paths)
     dest: "{{ nextcloud_apache2_config_path }}"
     mode: '0644'
   become: true
diff --git a/tasks/nginx_template.yaml b/tasks/nginx_template.yaml
index 3507be7..35942d9 100644
--- a/tasks/nginx_template.yaml
+++ b/tasks/nginx_template.yaml
@@ -1,11 +1,7 @@
 ---
 - name: Write nginx.conf file
   ansible.builtin.template:
-<<<<<<< HEAD
     src: nginx.conf
-=======
-    src: nginx.conf.j2
->>>>>>> 46b6f98 (Fixed template paths)
     dest: "{{ nextcloud_nginx_config_path }}"
     mode: '0644'
   become: true