resolve

Resolution comes from the word resolve which means to solve or find an answer to something.

For example:

The conflict between these two countries came to a peaceful resolution during the 1960's.

A resolution of a conflict between neighbors can be reached either through friendly discussion or in a court of law.