updating log out
fixing merge