Example repo for learning how to resolve merge conflicts
Example repo for learning how to resolve merge conflicts Forked version