Removed conflict comments