Fixes a merge conflict with debian/changelog

Signed-off-by: Dan Callahan <danc@element.io>