fixing auth.js merge issues