updated models
updated schema
shema merge fix