fixed merge conflicts on the login.php file