how to resolve merge conflict in vs code