Remove conflict guides