fix crash bug
fix bugs
merge conflict