biblical conflict resolution Matthew