fixing merge error
bug fixes in update parent mrca properties
Merge branch 'master' of github.com:OpenTreeOfLife/treemachine