Resolve conflicts after CE merge

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/views/projects/new.html.haml

@@ -69,13 +69,10 @@
             .nothing-here-block
               %h4 No import options available
               %p Contact an administrator to enable options for importing your project.
-<<<<<<< HEAD
 
         -# EE-specific start
         = render 'new_ci_cd_only_project_pane', active_tab: active_tab
         -# EE-specific end
-=======
->>>>>>> upstream/master
 
 .save-project-loader.d-none
   .center

doc/user/project/import/index.md

@@ -11,10 +11,7 @@
 1. [From SVN](svn.md)
 1. [From TFS](tfs.md)
 1. [From repo by URL](repo_by_url.md)
-<<<<<<< HEAD
 1. [From Gemnasium](gemnasium.md)
-=======
->>>>>>> upstream/master
 1. [By uploading a manifest file](manifest.md)
 
 In addition to the specific migration documentation above, you can import any