resets to fix login button
fixes merge conflicts