resolve merge conflicts

apps/cpu/RisingBubble2D/RisingBubble2D.cpp

apps/cpu/ViskomatXL/viskomat.cpp

...ualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.cpp

...alFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp

...tualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.h

...tualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp

...irtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.h

.../VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.h

...cessors/WriteMacroscopicQuantitiesPlusMassCoProcessor.cpp

...rocessors/WriteMacroscopicQuantitiesPlusMassCoProcessor.h