More cleanup of conflict messages