GitHub repository: F-Kirchhoff/web-git-conflicts-template
Description: A template repo showcasing how to merge conflicting branches