Resolve conflict in doc/user/project/import/github.md

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

doc/user/project/import/github.md

@@ -116,15 +116,9 @@ Depending your GitLab tier, [project mirroring](../../../workflow/repository_mir
 your imported project in sync with its GitHub copy.
 
 Additionally, you can configure GitLab to send pipeline status updates back GitHub with the
-<<<<<<< HEAD
-[GitHub Project Integration](../integrations/github.md). **[PREMIUM]**
-
-If you import your project using [CI/CD for external repo](../../../ci/ci_cd_for_external_repos/index.md), then both
-=======
 [GitHub Project Integration](https://docs.gitlab.com/ee/user/project/integrations/github.html). **[PREMIUM]**
 
 If you import your project using [CI/CD for external repo](https://docs.gitlab.com/ee/ci/ci_cd_for_external_repos/), then both
->>>>>>> upstream/master
 of the above are automatically configured. **[PREMIUM]**
 
 ## Improving the speed of imports on self-hosted instances