diff --git a/ig.ini b/ig.ini
index 08c4bd1..dca5267 100644
--- a/ig.ini
+++ b/ig.ini
@@ -3,16 +3,7 @@
 # see comments below for instructions
 
 ig = input/myig.xml
-<<<<<<< Updated upstream
-#template = fhir.base.template#current
 template = #bd-national-template
-=======
-template = fhir.base.template#current
->>>>>>> Stashed changes
-#template = D:\Git\templates\ig-template-base
-#template = #local-template
-
-
 
 ##########################
 ### ig.ini parameters: ###