fixing config merge