Resolves Conflicts

login.html is fully changed