When you do the Federal return, the state returns are approx. 80% complete.
After the Federal Return, do the non-resident state next, as this state should tax you only on income earned in that state.
Then last do the resident state, and it will tax you on all your income and give you a credit for taxes paid to nonresident state.
So you do not add income to each state, in the non-resident just make sure it is only taxing you on income earned in that state.