Properly fix the merging of included config files