removed merge artefacts from login.php