removed conflict messages