trying ti fix sign out
pulling lee's dealyed push
solving merge conflicts"