transition: test new user
merge conflict