resolve conflict in Gemfile.lock

Gemfile.lock

@@ -336,10 +336,7 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (>= 1.16)
       posix-spawn (~> 0.3)
-<<<<<<< HEAD
     gitlab-license (1.0.0)
-=======
->>>>>>> upstream/master
     gitlab-markup (1.6.4)
     gitlab-styles (2.3.2)
       rubocop (~> 0.51)
@@ -1081,10 +1078,7 @@ DEPENDENCIES
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-gollum-lib (~> 4.2)
   gitlab-gollum-rugged_adapter (~> 0.4.4)
-<<<<<<< HEAD
   gitlab-license (~> 1.0)
-=======
->>>>>>> upstream/master
   gitlab-markup (~> 1.6.4)
   gitlab-styles (~> 2.3)
   gitlab_omniauth-ldap (~> 2.0.4)