things did, files deleted
resolved conflict
Resolve merge conflicts again
Logout working
Removed swp and swo files
Login and sessions