Matthew Gospel conflict resolution