I trying to merge two branches and I have around 50 conflicted files(please check the screenshot), but the conflicted/changed files are not displayed in the left side anymor