Update schema
Fix merge conflict