fix merge cruft