Resolve docs conflicts

doc/administration/job_artifacts.md

@@ -89,15 +89,9 @@ _The artifacts are stored by default in
 
 >**Notes:**
 - [Introduced][ee-1762] in [GitLab Premium][eep] 9.4.
-- Since version 9.5, artifacts are [browsable], when object storage is enabled. 
+- Since version 9.5, artifacts are [browsable], when object storage is enabled.
   9.4 lacks this feature.
-<<<<<<< HEAD
-> Since version 10.6, available in [GitLab CE](https://about.gitlab.com/products/)
-=======
-> Available in [GitLab Premium](https://about.gitlab.com/pricing/) and
-[GitLab.com Silver](https://about.gitlab.com/gitlab-com/).
-> Since version 10.6, available in [GitLab CE](https://about.gitlab.com/pricing/)
->>>>>>> upstream/master
+> Since version 10.6, available in [GitLab Core](https://about.gitlab.com/pricing/)
 > Since version 11.0, we support direct_upload to S3.
 
 If you don't want to use the local disk where GitLab is installed to store the

doc/ci/variables/README.md

@@ -573,13 +573,9 @@ Below you can find supported syntax reference:
     Pattern matching is case-sensitive by default. Use `i` flag modifier, like
     `/pattern/i` to make a pattern case-insensitive.
 
-<<<<<<< HEAD
 [ee-2112]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2112
 [premium]: https://about.gitlab.com/products/ "Available only in GitLab Premium"
-=======
 [ce-13784]: https://gitlab.com/gitlab-org/gitlab-ce/issues/13784 "Simple protection of CI variables"
-[eep]: https://about.gitlab.com/pricing/ "Available only in GitLab Premium"
->>>>>>> upstream/master
 [envs]: ../environments.md
 [protected branches]: ../../user/project/protected_branches.md
 [protected tags]: ../../user/project/protected_tags.md

doc/user/project/integrations/bamboo.md

@@ -41,12 +41,7 @@ service in GitLab.
 1. Click 'Atlassian Bamboo CI'
 1. Select the 'Active' checkbox.
 1. Enter the base URL of your Bamboo server. 'https://bamboo.example.com'
-<<<<<<< HEAD
-1. Enter the build key from your Bamboo build plan. Build keys are typically made up from the Project Key and Plan Key that are set on project/plan creation and seperated with a '-' for example  **PROJ-PLAN**. This is a short,
-   all capital letter, identifier that is unique. When viewing a plan within Bamboo, the build key is also shown in the browser URL for example https://bamboo.example.com/browse/PROJ-PLAN
-=======
 1. Enter the build key from your Bamboo build plan. Build keys are typically made up from the Project Key and Plan Key that are set on project/plan creation and seperated with a '-' for example  **PROJ-PLAN**. This is a short, all capital letter, identifier that is unique. When viewing a plan within Bamboo, the build key is also shown in the browser URL for example https://bamboo.example.com/browse/PROJ-PLAN
->>>>>>> upstream/master
 1. If necessary, enter username and password for a Bamboo user that has
    access to trigger the build plan. Leave these fields blank if you do not require
    authentication.

doc/user/project/issues/index.md

@@ -34,13 +34,8 @@ your project public, open to collaboration.
 
 ### Streamline collaboration
 
-<<<<<<< HEAD
 With [Multiple Assignees for Issues](multiple_assignees_for_issues.md),
-available in [GitLab Starter](https://about.gitlab.com/products/)
-=======
-With [Multiple Assignees for Issues](https://docs.gitlab.com/ee/user/project/issues/multiple_assignees_for_issues.html),
 available in [GitLab Starter](https://about.gitlab.com/pricing/)
->>>>>>> upstream/master
 you can streamline collaboration and allow shared responsibilities to be clearly displayed.
 All assignees are shown across your workflows and receive notifications (as they
 would as single assignees), simplifying communication and ownership.
@@ -144,24 +139,19 @@ Find GitLab Issue Boards by navigating to your **Project's Dashboard** > **Issue
 Read through the documentation for [Issue Boards](../issue_board.md)
 to find out more about this feature.
 
-<<<<<<< HEAD
 ### Export Issues to CSV **[STARTER]**
 
 Issues can be [exported as CSV](csv_export.md) from GitLab and are sent to your email as an attachment.
 
 _Exporting issues to CSV is available only in [GitLab Enterprise Edition](https://about.gitlab.com/products/)._
 
-## Related Issues **[STARTER]**
+### Related Issues **[STARTER]**
 
 Related Issues are a bi-directional relationship between any two issues
 and appear in a block below the issue description. Issues can be across groups
 and projects.
 
 Read more about [Related Issues](related_issues.md).
-=======
-With [GitLab Starter](https://about.gitlab.com/pricing/), you can also
-create various boards per project with [Multiple Issue Boards](https://docs.gitlab.com/ee/user/project/issue_board.html#multiple-issue-boards).
->>>>>>> upstream/master
 
 ### External Issue Tracker
 

doc/user/project/merge_requests/index.md

@@ -429,13 +429,9 @@ git checkout origin/merge-requests/1
 
 [products]: https://about.gitlab.com/products/ "GitLab products page"
 [protected branches]: ../protected_branches.md
-<<<<<<< HEAD
 [ci]: ../../../ci/README.md
 [cc]: https://codeclimate.com/
 [cd]: https://hub.docker.com/r/codeclimate/codeclimate/
-[ee]: https://about.gitlab.com/products/ "GitLab Enterprise Edition"
 [sitespeed]: https://www.sitespeed.io
 [sitespeed-container]: https://hub.docker.com/r/sitespeedio/sitespeed.io/
-=======
 [ee]: https://about.gitlab.com/pricing/ "GitLab Enterprise Edition"
->>>>>>> upstream/master

doc/user/project/repository/index.md

@@ -165,17 +165,7 @@ Find it under your project's **Repository > Compare**.
 
 ## Locked files **[PREMIUM]**
 
-<<<<<<< HEAD
-[Lock your files](https://docs.gitlab.com/ee/user/project/file_lock.html) to
-prevent any conflicting changes.
-=======
-> Available in [GitLab Premium](https://about.gitlab.com/pricing/).
-
-Lock your files to prevent any conflicting changes.
-
-[File Locking](https://docs.gitlab.com/ee/user/project/file_lock.html) is available only in
-[GitLab Premium](https://about.gitlab.com/pricing/).
->>>>>>> upstream/master
+[Lock your files](../file_lock.md) to prevent any conflicting changes.
 
 ## Repository's API
 

doc/user/project/settings/index.md

@@ -42,11 +42,7 @@ Set up your project's merge request settings:
 
 ### Service Desk **[PREMIUM]**
 
-<<<<<<< HEAD
-Enable [Service Desk](https://docs.gitlab.com/ee/user/project/service_desk.html) for your project to offer customer support.
-=======
-Enable [Service Desk](https://docs.gitlab.com/ee/user/project/service_desk.html) for your project to offer customer support. Service Desk is available in [GitLab Premium](https://about.gitlab.com/pricing/).
->>>>>>> upstream/master
+Enable [Service Desk](../service_desk.md) for your project to offer customer support.
 
 ### Export project