Remove wrong conflict tag