diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 3163a3d669847f40bbc44b80b1b466ece27eea96..bf67fdb39798d98c67f8e3d86108a0eaf4b43ccf 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -165,8 +165,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     begin
       MergeRequests::ResolveService.new(@merge_request.source_project, current_user, params).execute(@merge_request)
 
-      flash[:conflicts_message] = 'Merge conflicts resolved.'
-      flash.keep
+      flash[:notice] = 'All merge conflicts were resolved. The merge request can now be merged.'
 
       render json: { redirect_to: namespace_project_merge_request_url(@project.namespace, @project, @merge_request, resolved_conflicts: true) }
     rescue Gitlab::Conflict::File::MissingResolution => e
diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml
index 4e96ab0595a6e6de9d50f01d8b460632b7882fdd..6ef640bb6543d1446ca42b3d71b6543b9260aedf 100644
--- a/app/views/projects/merge_requests/widget/_heading.html.haml
+++ b/app/views/projects/merge_requests/widget/_heading.html.haml
@@ -42,9 +42,3 @@
     .ci_widget.ci-error{style: "display:none"}
       = icon("times-circle")
       Could not connect to the CI server. Please check your settings and try again.
-
-- if flash[:conflicts_message]
-  .mr-widget-heading
-    .ci_widget
-      = ci_icon_for_status('success')
-      = flash[:conflicts_message]