Fix the conflict