kitchenmouse
Resolve sounds like what it means. I know that "resolve" has two meanings, but I tend to think of the "she resolved to do X" type as opposed to resolving a conflict. Conflict is another one of those words that looks and sounds like what it means.