Modified login.html with Confilcts