fix merge conflicts

important for LevelSaver!