Fix conflict in schema