new user added
conflict solved