updated Bookmarks
figuring out the login
merge conflict