fix schema conflict