diff --git a/src/routes/apiv2.coffee b/src/routes/apiv2.coffee
index 6411815e4f..10fec102df 100644
--- a/src/routes/apiv2.coffee
+++ b/src/routes/apiv2.coffee
@@ -456,12 +456,8 @@ module.exports = (swagger, v2) ->
       spec:
         path: "/groups/{gid}/chat"
         description: "Get all chat messages"
-<<<<<<< HEAD
         parameters: [path('gid','Group to return the chat from ','string')]
-      middleware: [auth.auth, groups.attachGroup]
-=======
       middleware: [auth.auth, i18n.getUserLanguage, groups.attachGroup]
->>>>>>> refactor(i18n): refactor user language detection, add to api methods
       action: groups.getChat