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