updated production.rb, removed the tags used to show merge conflict. removed those tags.