Conflicts: src/storm/modelchecker/AbstractModelChecker.cpp src/storm/modelchecker/AbstractModelChecker.h