you need to complete the CA return (non-resident) before you complete the Or return. this way you should get the proper credit on the Or return for the income taxed by both states.
