I think the merging algorithm is complete.  About to actually test it so will prob have to deal with hella bugs