Create local merged config override file.
Merge branch 'newconfig' into develop