Removed extra characters from conflict message