Bookmark diff & merge, work in progress