Correct changes to production.ini during merge