This version separates Conflict Resolution from Incident Reporting in order to clarify the difference between the two approaches. It also includes revisions made since the 9/1/2018 vote. (See Reporting Guide for previous versions.)Suggestions for revision can be made on this Disroot Pad.