If vim does not auto open, you will see MINGW64 /d/xampp/htdocs/stariumxcv.prod (your-feature-branch|CONFLICTS) in your command line. This means that git was not able to auto-resolve some merge conflicts.
To see the files that have conflicts, run:

git status

Resolve the merge conflicts.

git commit

In vim, type :x then press Enter