Remove conflict sign