Remove conflict remnant