Fix merge conflict in schema