Remove the conflict.