That's correct; include investment income and other general income, not attributable to another state, goes on your resident return. Also, be sure to update your non-resident return first because your resident return will give you a credit for taxes paid.
If you don't complete the states in this order the taxes may appear higher than they should be. If this has occurred, I'd recommend deleting and adding them back, nonresident and then resident.
