The best way to interpret how the central conflict was resolved in the story is:
The central conflict is resolved effectively since the girls resolve their differences and make a decision to leave a note.
This option highlights that the main tension between Mariko and Felice was about how to address the broken window, which they ultimately resolved by deciding to leave a note for the owner, demonstrating a solution to their conflict. The tornado's appearance adds an unexpected twist but doesn't negate the earlier resolution regarding their actions.