Changed assertion object and collapseddiffobj to not loop forever
Fixed merge conflict with assertion object.