schema fix
fixed conflict