delete zip
fix merge conflict