dupemerge: merge with waya-zblaxell, fix warning message