Merge changes to git storage of config dir
Unbork config post-merge