I am just a tax payer. My W2 has both of them added up as one entry. So, I think it is safe to say you can add them up manually
