Does federal add the w2 and 1099 pension together for the taxable amount ?