A constructive way to resolve conflicts.

 

v20240901