new merge implementations, still failing tests
Improved merge: all tests pass
Restore disabled unify test