conflict solved. service menu some parts added