bugfix
got rid of merge cruft