Removing useless conflict

src/includes/mentor/dashboard.pug

@@ -38,17 +38,11 @@ section#home
                     hidden
                         i.fas.fa-spinner.fa-spin
 
-<<<<<<< HEAD
-                include resources/detail.pug
-
-                h2.title_lead_avenir=`${data.RelatedResources}`
-=======
                 include resources/comment.pug
 
                 include resources/detail.pug
 
                 h2.title_form.related=`${data.RelatedResources}`
->>>>>>> 44ede0e17b643c8bf5eb11f00516bfea3ae53618
 
                 sib-display(
                     bind-resources