ffixing the conflict