fix merge config bug
fix merge config bug