fixed the conflict