This image shows the Conflicts section listing three files with conflicts as follows:

webApps/ webapp
    flows / main / pages
      main-start-page.html
    resources / images
      icon.png
    Readme.md

The Readme.md file's right-click menu is open showing the following options: Open in conflict editor, Open in default editor, Resolve, and Delete.