What is the proper English Translation of "収まる" (Osamaru).?

I used the romaji "Osamaru" as a Pin name form my Writings, as when I first asked I was told it meant "To bring an end to" or "To conclude" (a Story).

But I've recently been told it can mean several things, such as to "To settle back in place", "be brought back to the proper path" or "to settle a matter" So I am not really sure what a proper meaning would be.