removed extra characters from conflict