diff --git a/examples/client-auth-unleash.js b/examples/client-auth-unleash.js
index 743d547f69..13ad5b741e 100644
--- a/examples/client-auth-unleash.js
+++ b/examples/client-auth-unleash.js
@@ -9,10 +9,7 @@ const sharedSecret = '12312Random';
 unleash
     .start({
         databaseUrl: 'postgres://unleash_user:passord@localhost:5432/unleash',
-<<<<<<< HEAD
         enableLegacyRoutes: false,
-=======
->>>>>>> 0681945... Document how to secure client api #231
         preRouterHook: app => {
             app.use('/api/client', (req, res, next) => {
                 if (req.headers.authorization === sharedSecret) {