Welcome to the resolve_conflict wiki!

Wikis provide a place in your repository to lay out the roadmap of your project, show the current status, and document software better, together.