Removed conflict annotation