Fix some bugs
Fix conflict