Conflict resolution with 1/X and Task 5B Test Done