Include name in zip file
Fix merge conflict