merge master, new zip file