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 choice highlights that the main conflict between Mariko and Felice was addressed through their decision-making process and resolution, despite the subsequent events involving the tornado.