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