fix schema merge conflict