update schema
small changes
Fix merge conflicts
fix merge conflict