Updated ParaView reference
fixed merge conflicts