Fix ProjectImportState factory conflicts

spec/factories/import_state.rb

@@ -11,7 +11,6 @@ FactoryBot.define do
       association :project, factory: [:project, :repository]
     end
 
-<<<<<<< HEAD
     trait :mirror do
       transient do
         mirror true
@@ -26,23 +25,17 @@ FactoryBot.define do
       end
     end
 
-=======
->>>>>>> upstream/master
     trait :none do
       status :none
     end
 
     trait :scheduled do
       status :scheduled
-<<<<<<< HEAD
       last_update_scheduled_at { Time.now }
-=======
->>>>>>> upstream/master
     end
 
     trait :started do
       status :started
-<<<<<<< HEAD
       last_update_started_at { Time.now }
     end
 
@@ -52,17 +45,10 @@ FactoryBot.define do
       status :finished
       last_update_at timestamp
       last_successful_update_at timestamp
-=======
-    end
-
-    trait :finished do
-      status :finished
->>>>>>> upstream/master
     end
 
     trait :failed do
       status :failed
-<<<<<<< HEAD
       last_update_at { Time.now }
     end
 
@@ -70,8 +56,6 @@ FactoryBot.define do
       status :failed
       retry_count { Gitlab::Mirror::MAX_RETRY + 1 }
       last_update_at { Time.now - 1.minute }
-=======
->>>>>>> upstream/master
     end
 
     after(:create) do |import_state, evaluator|