Conflicts: app/views/layouts/base_projects.html.erb app/views/users/show.html.erb config/locales/zh.yml