remove the conflict tag