How do you deal with conflicts?

 

v20240901