Remove conflict code