On my 2020 Turbo Tax Deluxe Windows version, it does not seem to be resolved. It is subtracting the full City pension, and also $20,000 when all there is is the city pension. This leads to us getting back way too much.
