Fix your conflicts by being your own conflict coach #155

af Conflict Owner's Manual