Original conflict resolution

 

v20240901