Cleaned up zip file conflict mess.