fix merge conflicts after rebase

apps/cpu/CouetteFlow/CMakeLists.txt

apps/cpu/FlowAroundCylinder/CMakeLists.txt

apps/cpu/HerschelBulkleyModel/CMakeLists.txt

apps/cpu/HerschelBulkleySphere/CMakeLists.txt

apps/cpu/rheometer/CMakeLists.txt

apps/cpu/sphere/CMakeLists.txt

src/cpu/VirtualFluids.h

src/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.h

...VirtualFluidsCore/BoundaryConditions/BoundaryConditions.h

.../VirtualFluidsCore/BoundaryConditions/SlipBCAlgorithm.cpp

...ore/BoundaryConditions/VelocityWithDensityBCAlgorithm.cpp

...sCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp

...re/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp

src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp

...ualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.cpp

src/cpu/VirtualFluidsCore/Visitors/ConnectorBlockVisitor.cpp

src/cpu/VirtualFluidsCore/Visitors/ConnectorBlockVisitor.h

...VirtualFluidsCore/Visitors/InitThixotropyBlockVisitor.cpp

...u/VirtualFluidsCore/Visitors/InitThixotropyBlockVisitor.h

.../VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.cpp