login/signup flows working
conflict merge