How to resolve conflict quickly

 

v20240901