Conflict resolution (Matot-Masei, covenant & conversation 57