- bookmarks merge + some fixes