diff --git a/templates/elasticsearch.yml.j2 b/templates/elasticsearch.yml.j2
index 389114b..3c23f2d 100644
--- a/templates/elasticsearch.yml.j2
+++ b/templates/elasticsearch.yml.j2
@@ -27,7 +27,17 @@ path.logs: {{ log_dir }}
 path.repo: {{ es_path_repo }}
 {% endif %}
 
+<<<<<<< HEAD
 action.auto_create_index: {{ action_auto_create_index }}
+=======
+{% if es_action_auto_create_index == true %}
+action.auto_create_index: true
+{% elif not es_action_auto_create_index %}
+action.auto_create_index: false
+{% else %}
+action.auto_create_index: {{ es_action_auto_create_index }}
+{% endif %}
+>>>>>>> da527ec... Added support for providing an array with indices
 
 {% if es_enable_xpack %}
 {% if not "security" in es_xpack_features %}