diff --git a/SSZipArchive/SSZipArchive.h b/SSZipArchive/SSZipArchive.h
index d6db758..c26d515 100644
--- a/SSZipArchive/SSZipArchive.h
+++ b/SSZipArchive/SSZipArchive.h
@@ -43,7 +43,6 @@
 - (id)initWithPath:(NSString *)path;
 - (BOOL)open;
 - (BOOL)writeFile:(NSString *)path;
-- (BOOL)writeFile:(NSString *)filename basePath:(NSString *)base;
 - (BOOL)writeFileAtPath:(NSString *)path withFileName:(NSString *)fileName;
 - (BOOL)writeData:(NSData *)data filename:(NSString *)filename;
 - (BOOL)close;
@@ -61,11 +60,10 @@
 - (void)zipArchiveWillUnzipFileAtIndex:(NSInteger)fileIndex totalFiles:(NSInteger)totalFiles archivePath:(NSString *)archivePath fileInfo:(unz_file_info)fileInfo;
 - (void)zipArchiveDidUnzipFileAtIndex:(NSInteger)fileIndex totalFiles:(NSInteger)totalFiles archivePath:(NSString *)archivePath fileInfo:(unz_file_info)fileInfo;
 
-//<<<<<<< HEAD:SSZipArchive/SSZipArchive.h
 - (void)zipArchiveProgressEvent:(unsigned long long)loaded total:(unsigned long long)total;
 //=======
 - (void)zipArchiveDidUnzipArchiveFile:(NSString *)zipFile entryPath:(NSString *)entryPath destPath:(NSString *)destPath;
-//>>>>>>> 67403e8a283676787fcd07843aade0137452a04f:SSZipArchive.h
+
 @end
 
 #endif /* _SSZIPARCHIVE_H */