It is an normal behavior. Usually we will get the merge conflicts when we have changes changes in same line of source and destination files of merging.
In your case, you have resolved your conflicts in your file(i mean vs code) but it is not updated to git. So after adding Accept Incoming or Accept Current you have to do below steps,
- git add
<conflicts resolved files> - git commit -m “
merge conflict resolved message” - git push