fixing merge issue with user login