Conflict Resolution

Focus: Merge-Konflikt erzeugen, lesen, lösen und prüfen

This text file is intentionally not Markdown so the repository keeps the same Markdown file layout as the reference workshop.
