Isx dieseling

[Stf0713]

I have an 08’ international w/ 870isx new motor w/less than 400 thousand on it just replaced transfer and prime pump truck ran great for a week, then all of a sudden coming to a stop the truck is surging and levels out start up is surges no smoke and when I shut the key off the truck will not shut off for 10-25 seconds I have replaced fuel shut off solenoid and cleans metering and timing actuators.. I have pulled the power wire off the shut off solenoid and checked the power is actually cut off all of that is right but the truck is still dieseling help plz truck is going to international house if I can’t figure anything out