fixed create user
fixed merge