These conflicts will be resolved in the following commits. We do it this way so that PR review is possible.
Notice: This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
This extension provides GitHub features for VS Code.