Have multi-tree type merge working