singin and login solved
0merge with feature/111
change prod env
solve conflicts