try fix bug setNota
merge