diff --git a/src/librustdoc/html/render/search_index.rs b/src/librustdoc/html/render/search_index.rs
index 917be7cc8e9f..6d2bb31ee133 100644
--- a/src/librustdoc/html/render/search_index.rs
+++ b/src/librustdoc/html/render/search_index.rs
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 pub(crate) mod encode;
 
 use std::collections::hash_map::Entry;