diff --git a/templates/common/config/00-config.conf b/templates/common/config/00-config.conf
index 22b456c3..62d9f82b 100644
--- a/templates/common/config/00-config.conf
+++ b/templates/common/config/00-config.conf
@@ -18,10 +18,7 @@ max_logfile_count=1
 max_logfile_size_mb=20
 log_rotation_type=size
 log_file = {{ .LogFile }}
-{{ end }}
-# cache related parameters
-{{ if (index . "CacheEnabled") }}
->>>>>>> 2e22c55 (Remove enabled_backend entry from 00-config.conf)
+{{ if (index . "CacheEnabled") -}}
 image_cache_dir = {{ .ImageCacheDir }}
 image_cache_max_size =  {{ .CacheMaxSize }}
 image_cache_stall_time = 86400