diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 1002fa2cb07bd7cbed275037eeed8124316678d4..2ba1377ebdb884361a177a43832d12de3c6212b2 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -331,10 +331,7 @@ project:
 - settings
 - ci_cd_settings
 - import_export_upload
-<<<<<<< HEAD
 - vulnerability_feedback
-=======
->>>>>>> upstream/master
 award_emoji:
 - awardable
 - user