another conflict

no changes - trying to get step 10 back to this computer