Code review comment for lp:~lqb/update-notifier/kdeproxy+kwallet-support

thank you for your work, the current version of the merge request has conflicts (in data/package-data-downloader and debian/control), could you resolve those and resubmit it?