fixing the conflict