Resolve some of the conflicts[co skip]

app/models/merge_request.rb

@@ -4,14 +4,11 @@ class MergeRequest < ActiveRecord::Base
   include Noteable
   include Referable
   include Sortable
-<<<<<<< HEAD
   include Elastic::MergeRequestsSearch
   include Approvable
-=======
   include IgnorableColumn
 
   ignore_column :position
->>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
 
   belongs_to :target_project, class_name: "Project"
   belongs_to :source_project, class_name: "Project"

app/serializers/group_entity.rb

@@ -10,11 +10,7 @@ class GroupEntity < Grape::Entity
   expose :parent_id
   expose :created_at, :updated_at
 
-<<<<<<< HEAD
-  expose :web_url do |group|
-=======
   expose :group_path do |group|
->>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
     group_path(group)
   end
 

config/locales/en.yml

@@ -2,7 +2,6 @@
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
-<<<<<<< HEAD
   hello: "Hello world"
   activerecord:
     attributes:
@@ -15,8 +14,6 @@ en:
       wrong_size: "is the wrong size (should be %{file_size})"
       size_too_small: "is too small (should be at least %{file_size})"
       size_too_big: "is too big (should be at most %{file_size})"
-=======
->>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
   views:
     pagination:
       previous: "Prev"

spec/features/boards/boards_spec.rb

@@ -538,11 +538,7 @@ describe 'Issue Boards', feature: true, js: true do
   context 'signed out user' do
     before do
       gitlab_sign_out
-<<<<<<< HEAD
       visit namespace_project_boards_path(project.namespace, project)
-=======
-      visit namespace_project_board_path(project.namespace, project, board)
->>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
       wait_for_requests
     end
 
@@ -566,11 +562,7 @@ describe 'Issue Boards', feature: true, js: true do
       project.team << [user_guest, :guest]
       gitlab_sign_out
       gitlab_sign_in(user_guest)
-<<<<<<< HEAD
       visit namespace_project_boards_path(project.namespace, project)
-=======
-      visit namespace_project_board_path(project.namespace, project, board)
->>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
       wait_for_requests
     end
 

spec/features/commits_spec.rb

@@ -8,11 +8,7 @@ describe 'Commits' do
 
   describe 'CI' do
     before do
-<<<<<<< HEAD
-      gitlab_sign_in :user
-=======
       sign_in(user)
->>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
       stub_ci_pipeline_to_return_yaml_file
     end
 
@@ -195,11 +191,7 @@ describe 'Commits' do
 
     before do
       project.team << [user, :master]
-<<<<<<< HEAD
-      gitlab_sign_in(user)
-=======
       sign_in(user)
->>>>>>> bf57a7e80c44080dc7ec0fd774148afdae29cc31
       visit namespace_project_commits_path(project.namespace, project, branch_name)
     end