Resolve conflicts in fork network background migrations

lib/gitlab/background_migration/create_fork_network_memberships_range.rb

@@ -46,14 +46,11 @@ module Gitlab
             FROM fork_network_members
             WHERE fork_network_members.project_id = forked_project_links.forked_to_project_id
           )
-<<<<<<< HEAD
-=======
           AND EXISTS (
             SELECT true
             FROM projects
             WHERE forked_project_links.forked_from_project_id = projects.id
           )
->>>>>>> ce-com/master
           AND forked_project_links.id BETWEEN #{start_id} AND #{end_id}
         MISSING_MEMBERS
 

lib/gitlab/background_migration/populate_fork_networks_range.rb

@@ -20,14 +20,11 @@ module Gitlab
             FROM fork_networks
             WHERE forked_project_links.forked_from_project_id = fork_networks.root_project_id
           )
-<<<<<<< HEAD
-=======
           AND EXISTS (
             SELECT true
             FROM projects
             WHERE projects.id = forked_project_links.forked_from_project_id
           )
->>>>>>> ce-com/master
           AND forked_project_links.id BETWEEN #{start_id} AND #{end_id}
         INSERT_NETWORKS
 

spec/lib/gitlab/background_migration/populate_fork_networks_range_spec.rb

@@ -62,8 +62,6 @@ describe Gitlab::BackgroundMigration::PopulateForkNetworksRange, :migration, sch
     expect(base2_membership).not_to be_nil
   end
 
-<<<<<<< HEAD
-=======
   it 'skips links that had their source project deleted' do
     forked_project_links.create(id: 6, forked_from_project_id: 99999, forked_to_project_id: create(:project).id)
 
@@ -72,7 +70,6 @@ describe Gitlab::BackgroundMigration::PopulateForkNetworksRange, :migration, sch
     expect(fork_networks.find_by(root_project_id: 99999)).to be_nil
   end
 
->>>>>>> ce-com/master
   it 'schedules a job for inserting memberships for forks-of-forks' do
     delay = Gitlab::BackgroundMigration::CreateForkNetworkMembershipsRange::RESCHEDULE_DELAY