fixing merge in users.php