merge now passes all tests