removing merge cruft