small fix
fix conflict