remove conflict messages