diff --git a/ig.ini b/ig.ini
index d13f445..08c4bd1 100644
--- a/ig.ini
+++ b/ig.ini
@@ -3,8 +3,12 @@
 # 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