small fix
fixed conflict