diff --git a/keystone/templates/etc/_keystone.conf.tpl b/keystone/templates/etc/_keystone.conf.tpl
index bac37db40b..4a3b2cab18 100644
--- a/keystone/templates/etc/_keystone.conf.tpl
+++ b/keystone/templates/etc/_keystone.conf.tpl
@@ -135,7 +135,6 @@
 # From keystone
 #
 
-<<<<<<< HEAD
 # Using this feature is *NOT* recommended. Instead, use the `keystone-manage
 # bootstrap` command. The value of this option is treated as a "shared secret"
 # that can be used to bootstrap Keystone through the API. This "token" does not