solve Cconflict