An effective way to resolve conflicts

   

v20221217