Fixed merge cruft