Removed the conflict