adding prod settings
merge