diff --git a/Gemfile.lock b/Gemfile.lock
index 65c5b2e3a03..c847424a7c4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -708,13 +708,8 @@ DEPENDENCIES
   gitlab-flowdock-git-hook (~> 0.4.2)
   gitlab-grack (~> 2.0.0.rc2)
   gitlab-linguist (~> 3.0.1)
-<<<<<<< HEAD
   gitlab_emoji (~> 0.1)
-  gitlab_git (= 7.0.1)
-=======
-  gitlab_emoji (~> 0.0.1.1)
   gitlab_git (= 7.1.0)
->>>>>>> master
   gitlab_meta (= 7.0)
   gitlab_omniauth-ldap (= 1.2.0)
   gollum-lib (~> 4.0.0)