Remove conflict text