Resolve conflicts for nested group setup

spec/features/boards/boards_spec.rb

@@ -3,16 +3,11 @@ require 'rails_helper'
 describe 'Issue Boards', feature: true, js: true do
   include DragTo
 
-<<<<<<< HEAD
-  let(:project) { create(:empty_project, :public) }
+  let(:group) { create(:group, :nested) }
+  let(:project) { create(:empty_project, :public, namespace: group) }
   let(:milestone) { create(:milestone, title: "v2.2", project: project) }
   let!(:board)  { create(:board, project: project) }
   let!(:board_with_milestone)  { create(:board, project: project, milestone: milestone) }
-=======
-  let(:group) { create(:group, :nested) }
-  let(:project) { create(:empty_project, :public, namespace: group) }
-  let(:board)   { create(:board, project: project) }
->>>>>>> upstream/master
   let(:user)    { create(:user) }
   let!(:user2)  { create(:user) }