Merge conflict in production.rb