Conflicts: src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties