diff --git a/templates/common/config/00-config.conf b/templates/common/config/00-config.conf
index 22b456c3..649a2295 100644
--- a/templates/common/config/00-config.conf
+++ b/templates/common/config/00-config.conf
@@ -21,7 +21,6 @@ log_file = {{ .LogFile }}
 {{ end }}
 # cache related parameters
 {{ if (index . "CacheEnabled") }}
->>>>>>> 2e22c55 (Remove enabled_backend entry from 00-config.conf)
 image_cache_dir = {{ .ImageCacheDir }}
 image_cache_max_size =  {{ .CacheMaxSize }}
 image_cache_stall_time = 86400
@@ -37,6 +36,9 @@ db_max_retries = -1
 [file]
 filesystem_store_datadir = /var/lib/glance/images
 
+[glance_store]
+default_backend=default_backend
+
 [keystone_authtoken]
 www_authenticate_uri={{ .KeystonePublicURL }}
 auth_url={{ .KeystoneInternalURL }}