merge change
merge
fix minor bug