Resolve conficts

.../intermediate/parcels/include/makeParcelInjectionModels.H

...els/include/makeReactingMultiphaseParcelInjectionModels.H

...diate/parcels/include/makeReactingParcelInjectionModels.H

...ls/Kinematic/InjectionModel/ConeInjection/ConeInjection.C

...ls/Kinematic/InjectionModel/ConeInjection/ConeInjection.H

...inematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C

...inematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H

...bjects/field/fieldValues/cellSource/cellSourceTemplates.C

...bjects/field/fieldValues/faceSource/faceSourceTemplates.C

...actingParcelFilmFoam/hotBoxes/constant/reactingCloud1Axes

...gParcelFilmFoam/hotBoxes/constant/reactingCloud1Positions

...ParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties

...gParcelFilmFoam/multipleBoxes/constant/reactingCloud1Axes

...elFilmFoam/multipleBoxes/constant/reactingCloud1Positions

...lFilmFoam/multipleBoxes/constant/reactingCloud1Properties