How do you resolve conflicts?

 

v20240901