Use _path helper instead of _url helper

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

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