Added ability to merge config files