Resolve conflicts in `spec/policies/project_policy_spec.rb`

spec/policies/project_policy_spec.rb

@@ -155,11 +155,7 @@ describe ProjectPolicy do
     let(:feature_write_abilities) do
       described_class::READONLY_FEATURES_WHEN_ARCHIVED.flat_map do |feature|
         described_class.create_update_admin_destroy(feature)
-<<<<<<< HEAD
       end + additional_reporter_permissions + additional_master_permissions
-=======
-      end
->>>>>>> upstream/master
     end
 
     let(:other_write_abilities) do