resolved Conflicts: - applications/solvers/cfdemSolverIB/Make/options - etc/solver-list.txt - src/lagrangian/cfdemParticle/Make/files - src/lagrangian/cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.C resolved Issues: src/lagrangian/cfdemParticle/subModels/ShirgaonkarIBTorque/ShirgaonkarIBTorque.C