finish export test (check if every file has been zipped)
Merge origin/master