What was the conflict? Let's fix it