diff --git a/src/yapsut/template_subs.py b/src/yapsut/template_subs.py
index 020ffc6c6f72ebff6ef02dbfe552caa2b4c2bad5..ad2323be265614182fbe57b8e0fdba36de8580b6 100644
--- a/src/yapsut/template_subs.py
+++ b/src/yapsut/template_subs.py
@@ -110,11 +110,7 @@ class templateFiller:
       if not self.isfilled() :
          raise Exception('Error, not all the keywords are filled')
       #
-<<<<<<< HEAD
-      tout=self._t
-=======
       tout=self.template
->>>>>>> 290e1038d5d1ec3c06881a87ca11cdeac5ef32ae
       for ik,k in enumerate(self._k) :
          keyName=self._kfill[ik]
          tout=tout.replace(keyName,self._d[k])