/handle-git-conflicts

This is just a test repo to figure out how to handle complex git conflicts in merging repos

No issues in this repository yet.