BUGFIX: Order of passing halos to UpdateMergerTree

First pass halos at the previous time-step and then at
the current time-step.
BUGFIX: Fix erroneous asserts
WIP: