changes schema
merge conflicts