fix bad merge cruft