removed the conflict