This is a repository for learning how to sove conflicts when merging them
No issues in this repository yet.