settings file from prod
merge