Resolving conflict with doc/ci/variables/README.md

doc/ci/variables/README.md

@@ -467,11 +467,7 @@ export CI_REGISTRY_PASSWORD="longalfanumstring"
 
 [ee-2112]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2112
 [ce-13784]: https://gitlab.com/gitlab-org/gitlab-ce/issues/13784 "Simple protection of CI secret variables"
-<<<<<<< HEAD
 [premium]: https://about.gitlab.com/products/ "Available only in GitLab Premium"
-=======
-[eep]: https://about.gitlab.com/products/ "Available only in GitLab Premium"
->>>>>>> upstream/master
 [envs]: ../environments.md
 [protected branches]: ../../user/project/protected_branches.md
 [protected tags]: ../../user/project/protected_tags.md