merge
Push to remote. errors
login with email and password
idk