Fixes schema merge conflict