fixed merge cruft