other ways to solve conflict