merging zip fix