Resolve conflict in .gitlab-ci.yml

Signed-off-by: Rémy Coutable <remy@rymai.me>

.gitlab-ci.yml

@@ -29,11 +29,8 @@ variables:
   KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json
   KNAPSACK_SPINACH_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/spinach_report-master.json
   FLAKY_RSPEC_SUITE_REPORT_PATH: rspec_flaky/report-suite.json
-<<<<<<< HEAD
   # This hack is needed to make ES not that memory hungry
   ES_JAVA_OPTS: "-Xms256m -Xmx256m"
-=======
->>>>>>> ce-com/master
 
 before_script:
   - bundle --version