Conflicts: public/stylesheets/public.css
显示更新内容
Conflicts: app/controllers/users_controller.rb
Conflicts: db/schema.rb
Conflicts: app/views/users/user_messages.html.erb