remove a conflict remnant