adding user routes
merge