Fix conflicts in debian control