結果 : how to resolve git conflicts in visual studio code