Conflicts: src/formula/Formulas.h src/formula/PctlPathFormula.h src/formula/PctlStateFormula.h src/formula/ProbabilisticBoundOperator.h src/formula/RewardBoundOperator.h src/modelChecker/DtmcPrctlModelChecker.h src/parser/PrctlParser.cpp src/parser/PrctlParser.h