Create user2

fixed merge conflict