You also have to decide if you think the punishment justified the action. Although the vast lifestyle change by Mathilde and her husband wasn't so much a choice as a necessity, it was certainly a big sacrifice from the life they previous knew, her husband in particular. I always have some students that are angry at the end because they don't believe that Mathilde deserved a punishment that is that severe; they think Mathilde should be allowed to keep the new, genuine necklace as a reward for her efforts. Of course, there are also students who believe she got what was coming to her as a result of concealing the truth in the first place. In that instance, if you believe she deserved the punishment, then, yes, the conflict is resolved. If you think her drastic lifestyle change was too much, then our original conflict simply became another conflict that still needs resolving.
The answer to this question depends on whether you believe that Mathilde's experiences caused her to conquer her character flaw, pride. Throughout the story Mathilde struggles with her pride in her appearance and her desire to be rich and admired. By the end she has lost all possibility of being rich and beautiful because her pride did not permit her to confess to her friend that she had lost the necklace. We do not know what Mathilde's reaction was to the news that the necklace that she had been loaned was a fake. Hopefully she learned that the things she had valued were actually valueless. Everything that she had of true value, namely her family, was lost as a result of her pride.