finalized merge, tests pass