Conflict Resolution process 4.2021