Just getting to know merge conflicts and understanding how to resolve them! :)
This repository is not active