LevelSet fix
conflict