Verified Answer :

the resolution I think because that is when the main conflict is resolved.