chore(sync-noir): fix modify/delete conflicts automatically#8090

ludamad merged 1 commit intomasterAztecProtocol/aztec-packages:masterfrom

ad/fix/modify/deleteAztecProtocol/aztec-packages:ad/fix/modify/deleteCopy head branch name to clipboard