Some testing appears to suggest that the merging of a client config in the local directory (for something like a git repo) is not currently working.
Verify this and fix it if required.
In all actuality we should walk up the filesystem looking for the first config that we find, to merge with the primary config file (or use if no primary is found)