How to resolve conflict in vscode

Question

When I develop apps in vscode, I tried git pull.

And then I Accept Both Change

Therefore now , Both changes are reflected.

But