take out some merge cruft