The merge looks fine to me. Have you verified that ifenslave works properly after the merge? (a quite smoketest will suffice).
Just one thing, when you commit for a merge using bzr commit, see if you can remove the Debian entries or otherwise rearrange them so it's clear whether it's Debian or Ubuntu changes, since on top of a merge you might need to make extra changes.
The merge looks fine to me. Have you verified that ifenslave works properly after the merge? (a quite smoketest will suffice).
Just one thing, when you commit for a merge using bzr commit, see if you can remove the Debian entries or otherwise rearrange them so it's clear whether it's Debian or Ubuntu changes, since on top of a merge you might need to make extra changes.