I would probably enter a substitute W-2 (Form 4852) by removing the amount shown with code D in box 12 and adding that amount to the amount shown in box 1. Form 4852 allows (requires) you to provide an explanation.
