See my note above.  I don't expect they'll ever be fully combined because there are just too many differences.  But they could certainly share more code in the future than they do today.  I think that's probably out of scope for this story, though.