were you watching the movie with your eyes closed? The conflict started because joy was being controlling and not letting the other emotions through, mainly with sadness. At the end, she accepts that other emotions besides joy are needed, and lets sadness and the others control when needed.