Generated schema
Resolve merge conflict