Fixed the merge error text in the login.php file