update production.rb
merge conflicts