plugins to enhance productivity with git merges