Formatting fixes
Initial bug fixes for flipped order of quadrature points and weights in merge