GitHub repository: ntijoh-linus-gamborn/Merge-Conflict
Description: Test repo for conflict handling