Remove cruft from conflict.
BUGZID: