In a team conflict, your priority is:

Options

• That the problem gets solved well, even if someone's uncomfortable
• That nobody gets trampled, even if the problem takes longer to solve