Remove conflict