removes conflict tag