Fixed config merge