Normal apartment. How to see merge conflicts in vscode.

Kase meaning in English. 新越谷 駅から北越谷 駅.