modified some bug
merge code