biblical conflict resolution steps matthew