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 reflects the primary focus of the character conflict between Mariko and Felice as they navigate their disagreement about how to handle the situation after breaking the window, ultimately coming to a resolution through communication and a decision to take responsibility.