Intermediate Checkin

Stage: Chimerge is performed and then the blocks within ChiSquare Unit
is merged.
Still do to: Global merge between ChiSquareBlocks.