Merge branch 'aqualls-update-ui-links' into 'master'

Update UI link to new conflicts page

See merge request gitlab-org/gitlab!73565

app/serializers/merge_request_widget_entity.rb

@@ -48,7 +48,7 @@ class MergeRequestWidgetEntity < Grape::Entity
   end
 
   expose :conflicts_docs_path do |merge_request|
-    help_page_path('user/project/merge_requests/resolve_conflicts.md')
+    help_page_path('user/project/merge_requests/conflicts.md')
   end
 
   expose :reviewing_and_managing_merge_requests_docs_path do |merge_request|