cnflict solved