resolve conflict (doc/ee/readme)

doc/README.md

@@ -51,11 +51,7 @@ Shortcuts to GitLab's most visited docs:
 - [Importing and exporting projects between instances](user/project/settings/import_export.md).
 - [Project access](public_access/public_access.md): Setting up your project's visibility to public, internal, or private.
 - [Groups](user/group/index.md): Organize your projects in groups.
-<<<<<<< HEAD
   - [Subgroups](user/group/subgroups/index.md): nest groups in subgroups.
-=======
-  - [GitLab Subgroups](user/group/subgroups/index.md)
->>>>>>> ce-com/master
 - [Search through GitLab](user/search/index.md): Search for issues, merge requests, projects, groups, todos, and issues in Issue Boards.
   - **(EES/EEP)** [Advanced Global Search](user/search/advanced_global_search.md): Leverage Elasticsearch for faster, more advanced code search across your entire GitLab instance.
   - **(EES/EEP)** [Advanced Syntax Search](user/search/advanced_search_syntax.md): Use advanced queries for more targeted search results.