Fix bugs
Fix conflicts
Fix bugs