To resolve something means to find a solution.
She resolved the problem with her children by giving them both a toy.