update production settings
fix merge conflict from rebase