After you file

while you're at it, you will have to remove the 1040X that does not properly reflect all the changes you want to make.