Conflicts: applications/solvers/compressible/steadyCompressibleFoam/pEqn.H
Conflicts: applications/solvers/compressible/steadyCompressibleFoam/hEqn.H