merge production.rb