[#858] remove merge cruft