Use new syntax for config files in merge
Bump version