correct changes to production.rb
email problem
fix conflicts