結果 : how to resolve conflict in git using vs code