Fix merge conflicts in Boards::CreateService and specs

app/services/boards/create_service.rb

@@ -3,18 +3,9 @@ module Boards
     def execute
       board = project.boards.create(params)
 
-<<<<<<< HEAD
       if board.persisted?
-        board.lists.create(list_type: :backlog)
         board.lists.create(list_type: :done)
       end
-=======
-    private
-
-    def create_board!
-      board = project.boards.create
-      board.lists.create(list_type: :done)
->>>>>>> ce/master
 
       board
     end

spec/services/boards/create_service_spec.rb

@@ -11,11 +11,7 @@ describe Boards::CreateService, services: true do
         expect { service.execute }.to change(project.boards, :count).by(1)
       end
 
-<<<<<<< HEAD
-      it "creates board's default lists" do
-=======
       it 'creates the default lists' do
->>>>>>> ce/master
         board = service.execute
 
         expect(board.lists.size).to eq 1
@@ -47,9 +43,8 @@ describe Boards::CreateService, services: true do
       it "creates board's default lists" do
         board = service.execute
 
-        expect(board.lists.size).to eq 2
-        expect(board.lists.first).to be_backlog
-        expect(board.lists.last).to be_done
+        expect(board.lists.size).to eq 1
+        expect(board.lists.first).to be_done
       end
     end
   end