Fixing export data as zip (rebase problem)