diff --git a/HISTORY.md b/HISTORY.md
index d0f5585451..102031b154 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -7,8 +7,6 @@
 * Removed arena.h from public header files.
 * By default, checksums are verified on every read from database
 
->>>>>>> master
-
 ## 2.7.0 (01/28/2014)
 
 ### Public API changes