moving to simplified treemerge strategy, deprecating merge.js
cleaning up after moving to simpler tree merging algorithm