fix bugs
merge