add/supr usr
Merge commit