cleaned up conflict messages