conflict resolution in Matthew