Fix .gitlab-ci.yml conflicts

.gitlab-ci.yml

@@ -315,29 +315,6 @@ downtime_check:
     - tags
     - /^[\d-]+-stable(-ee)?$/
     - /(^docs[\/-].*|.*-docs$)/
-<<<<<<< HEAD
-=======
-
-ee_compat_check:
-  <<: *rake-exec
-  only:
-    - branches@gitlab-org/gitlab-ce
-  except:
-    - master
-    - tags
-    - /^[\d-]+-stable(-ee)?$/
-  allow_failure: yes
-  cache:
-    key: "ee_compat_check_repo"
-    paths:
-      - ee_compat_check/ee-repo/
-  artifacts:
-    name: "${CI_JOB_NAME}_${CI_COMIT_REF_NAME}_${CI_COMMIT_SHA}"
-    when: on_failure
-    expire_in: 10d
-    paths:
-      - ee_compat_check/patches/*.patch
->>>>>>> upstream/master
 
 .db-migrate-reset: &db-migrate-reset
   stage: test