Merge zhparser