correct paths for zip files
fix conflicts