Bookmarks: Update bookmarks list
Git: Update git aliases
Git: Use diff3 to show merge conflicts