This image shows a combined image of 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

On the left, the Readme.md file's right-click menu shows the following options: Open in conflict editor, Open in default editor, Resolve, and Delete.

On the right, the icon.png file's right-click menu shows the following options: Delete file and Keep file.