Update schema
Fix conflicts