schema conflict resolved