diff --git a/dockerContainer.yml b/dockerContainer.yml
index d0b1fe8..5b7ba67 100644
--- a/dockerContainer.yml
+++ b/dockerContainer.yml
@@ -214,15 +214,10 @@
   tags: always
 #----------------------------------/Check ENV----------------------------------
 
-<<<<<<< HEAD
 - name: Restart the container if fileChanged is defined
   set_fact: item.value.restart='yes'
   when: fileChanged is defined
 
-=======
-
-#TODO - If a confile file or volume is changed, trestart the container
->>>>>>> 4f62020d89990a6ff0b6ec67f986f613e77f308f
 
 - name: "Container {{ container_Name }}"
   become: yes