Conflict Resolution, second attempt