diff --git a/app/coffee/modules/team/main.coffee b/app/coffee/modules/team/main.coffee
index f91d6ec3..4d37a0d7 100644
--- a/app/coffee/modules/team/main.coffee
+++ b/app/coffee/modules/team/main.coffee
@@ -56,12 +56,6 @@ class TeamController extends mixOf(taiga.Controller, taiga.PageMixin)
         # On Error
         promise.then null, @.onInitialDataError.bind(@)
 
-<<<<<<< HEAD
-=======
-        @scope.currentUser = @auth.getUser()
-        @scope.projectId = @rootscope.projectId
-
->>>>>>> Allowing leave project
     setRole: (role) ->
         if role
             @scope.filtersRole = role