How do we resolve conflicts as a self-organised team?

English