addUser
server-client
merge