This is a repository for learning how to sove conflicts when merging them
This repository is not active