Fix conflict in app/views/projects/wikis/_sidebar.html.haml

app/views/projects/wikis/_sidebar.html.haml

 %aside.right-sidebar.right-sidebar-expanded.wiki-sidebar.js-wiki-sidebar.js-right-sidebar{ data: { "offset-top" => "50", "spy" => "affix" } }
   .sidebar-container
     .block.wiki-sidebar-header.append-bottom-default
-<<<<<<< HEAD
-      %a.gutter-toggle.float-right.d-block.d-md-none.js-sidebar-wiki-toggle{ href: "#" }
-=======
       %a.gutter-toggle.float-right.d-block.d-sm-block.d-md-none.js-sidebar-wiki-toggle{ href: "#" }
->>>>>>> gitlab-ce/master
         = icon('angle-double-right')
 
       - git_access_url = project_wikis_git_access_path(@project)