Conflicts: src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp It looks like you may be committing a cherry-pick.