added missing timezone to the debian/changelog file
resolve merge conflict