conflict fix
modified printed errors
modified error printing