routes
merge conflict in routes file
sign in with login (username or email)