fix config merge