continued conflict handelling