views and urls for users
user forms push merge conflict fixed