error message fix
merge confl