login.html is complete
Merge conflict resolution