new merge implementations, still failing tests