Remove conflict messages. #6