Resolve merge conflicts in routes.rb.