zip
fix zip merge