Fix conflict in app/views/shared/issuable/form/_title.html.haml

app/views/shared/issuable/form/_title.html.haml

@@ -30,7 +30,6 @@
         merge request from being merged before it's ready.
 
   - if no_issuable_templates && can?(current_user, :push_code, issuable.project)
-<<<<<<< HEAD
     - if @project.feature_available?(:issuable_default_templates)
       %p.form-text.text-muted
         Add
@@ -38,9 +37,3 @@
         to help your contributors communicate effectively!
     - elsif show_promotions?
       = render 'shared/promotions/promote_issue_templates'
-=======
-    %p.form-text.text-muted
-      Add
-      = link_to 'description templates', help_page_path('user/project/description_templates'), tabindex: -1
-      to help your contributors communicate effectively!
->>>>>>> gitlab-ce/master