patch: remove obsolete conflicts.