modify Gemfile
merge conflict in production.html.erb
fix css errors
precompile assets
merge conflict in application.css