norme
memory fix
merge
error display