Fixed the conflict