Conflicts: app/views/layouts/new_base.html.erb app/views/layouts/new_base_user.html.erb app/views/users/_user_resource_info.html.erb