fix bugs
edit conflict