Removed a conflict tag