Expand Energy interview question

How do you resolve conflicts in TFS?