removed the conflict statement