fix(merge): replace two-way DMP patch with proper three-way merge — prevents silent data loss on conflict (#353, #180)#375

iamhyc wants to merge 1 commit into

masteroverleaf-workshop/Overleaf-Workshop:masterfrom

fix/three-way-merge-conflictsoverleaf-workshop/Overleaf-Workshop:fix/three-way-merge-conflictsCopy head branch name to clipboard