fix bug
fix bugs
remove merging error