the best changes in the world
resolve conflicts