Modified BoardState.merge() to consider extraData (TreeTent links, etc)
and remove any extraData that is not common to all the nodes being
merged.