Removed zip files.
Fixed merge conflicts?