diff --git a/server/camlistored/newui/blob_item_container.js b/server/camlistored/newui/blob_item_container.js
index 7edcc2233..1ec0d3663 100644
--- a/server/camlistored/newui/blob_item_container.js
+++ b/server/camlistored/newui/blob_item_container.js
@@ -56,7 +56,6 @@ camlistore.BlobItemContainer.THUMBNAIL_SIZES_ = [25, 50, 75, 100, 150, 200];
 
 
 /**
-<<<<<<< HEAD
  * @type {goog.events.FileDropHandler}
  * @private
  */