Skipped unnecessary files in zip
Fixed some merge errors