diff --git a/app/controllers/projects/merge_requests/conflicts_controller.rb b/app/controllers/projects/merge_requests/conflicts_controller.rb
index 66a358963e2388dbc49bfe255fd9941759d47e3f..26f4286233a9a6a6b3b94ca82e9fbf4bc78926c0 100644
--- a/app/controllers/projects/merge_requests/conflicts_controller.rb
+++ b/app/controllers/projects/merge_requests/conflicts_controller.rb
@@ -67,7 +67,7 @@ def resolve_conflicts
 
       flash[:notice] = _('All merge conflicts were resolved. The merge request can now be merged.')
 
-      render json: { redirect_to: project_merge_request_url(@project, @merge_request, resolved_conflicts: true) }
+      render json: { redirect_to: project_merge_request_path(@project, @merge_request, resolved_conflicts: true) }
     rescue Gitlab::Git::Conflict::Resolver::ResolutionError => e
       render status: :bad_request, json: { message: e.message }
     end
diff --git a/app/views/layouts/header/_current_user_dropdown.html.haml b/app/views/layouts/header/_current_user_dropdown.html.haml
index 7ce914cf66028e1eb78c33cc9236a7d5173c60f9..75de13d4862ecc5fd4e72fa8182ac414d3bf7cb1 100644
--- a/app/views/layouts/header/_current_user_dropdown.html.haml
+++ b/app/views/layouts/header/_current_user_dropdown.html.haml
@@ -43,7 +43,7 @@
       = link_to _("Switch to GitLab Next"), Gitlab::Saas.canary_toggle_com_url, data: { track_action: "click_link", track_label: "switch_to_canary", track_property: "navigation_top" }
 
   %li.divider
-  .js-new-nav-toggle{ data: { enabled: show_super_sidebar?.to_s, endpoint: profile_preferences_url} }
+  .js-new-nav-toggle{ data: { enabled: show_super_sidebar?.to_s, endpoint: profile_preferences_path} }
 
   - if current_user_menu?(:sign_out)
     %li.divider