fix bug
merge