I filed by tax with turbotax electronically but later on have to amend it to fix it. But I haven't file my California state tax.

In this case, what should I do for my state tax return:

540 with same information as old 1040 + old 1040 + 1040x + new 1040 + 540x? 

Or

new 540 + new 1040?