Fix the conflict.