fix merge config bug