How should we resolve conflict within the church? The article offers some guidance on conflict resolution, explaining the value of raising and answering two key questions: what kind of conflict are we in, and what do we need to do to resolve this conflict?