removed merge cruft