fix the conflict