1) Tell me about a time you led a team through a tough challenge?
2) Tell me about a time when you worked in a team and had to manage a conflict?
Isn't the conflict part (#2) a subset of the challenge part (#1)? OR is #1 more focused on how you helped them understand what needs to be done or guided them through it to solve the issue - but there probably was no conflict anywhere (which seems unlikely)