Fix merge conflicts.
Fix merge conflicts.
Make sure the postprocessor can also work in case we use a direct solver, where pressure and velocity dofs reside in the same block.