Fix merge conflict with .gitlab-ci.yml

https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8475

.gitlab-ci.yml

@@ -33,14 +33,11 @@ variables:
   KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json
   FLAKY_RSPEC_SUITE_REPORT_PATH: rspec_flaky/report-suite.json
   BUILD_ASSETS_IMAGE: "false"
-<<<<<<< HEAD
   ## EE specific variables ##
   # This hack is needed to make ES not that memory hungry
   ES_JAVA_OPTS: "-Xms256m -Xmx256m"
   ELASTIC_URL: "http://elastic:changeme@docker.elastic.co-elasticsearch-elasticsearch:9200"
   EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master-ee.json
-=======
->>>>>>> upstream/master
 
 before_script:
   - bundle --version