Merge zsdx