More merge

All tests pass.