Removed conflict messages