debian/changelog merge=ours
debian/source/format merge=ours
