Removed conflict