Do you have a plain debdiff between current Debian and the merge? That's much easier to review/upload.
Do you have a plain debdiff between current Debian and the merge? That's much easier to review/upload.