/git-conflict

Create git conflict then fix

This repository is not active