CONFLICT (modify/delete): debian/patches/series deleted in kubuntu_zesty_archive and modified in HEAD. Version HEAD of debian/patches/series left in tree.
Removing debian/patches/kubuntu_disable_failing_test.diff
Auto-merging debian/control
Auto-merging debian/changelog
CONFLICT (content): Merge conflict in debian/changelog
Automatic merge failed; fix conflicts and then commit the result.