How can I get Visual Studio to show merge conflicts under git? -

i'm using visual studio 2015 pro , working git repo. let's did pull or applied stashed changes or did causes branch become in conflict. example, in case applied stash:

as can see, have bunch of changes web.config in conflict. why xml files have conflicts?

now, go visual studio , go team explorer->changes:

here, see staged changes, there zero unstaged changes. i'm wondering why web.config doesn't show here can resolve conflicts.

two things:

1. i believe if pull using visual studio, detect conflicts run merge tool. haven't tried yet, know works way tfs. however, i'd know if can use git pull command line , use visual studio resolve conflicts.
2. git config --global merge.tool vsdiffmerge if run git mergetool command line, then use visual studio merge. however, doing spawns whole new instance of visual studio slow , annoying, , doesn't let me work in context of rest of project.

anyone have insight on one? thanks!