This document describes conflict resolution tools and techniques used in workshops conducted in West Africa. The workshops were conducted over 4 years with farmers in Mali, with the goal of increasing productivity without chemical fertilizers. The workshops taught conflict resolution techniques including grounding, greeting circles, adaptive learning, and consensus building. These techniques helped resolve conflicts among farmers and led to no violent conflicts reported for two years after the workshops, demonstrating the effectiveness of the collaborative problem-solving approach.