diff --git a/src/librustdoc/json/conversions.rs b/src/librustdoc/json/conversions.rs
index d9f52cbf34c4..a4592ddc9437 100644
--- a/src/librustdoc/json/conversions.rs
+++ b/src/librustdoc/json/conversions.rs
@@ -434,7 +434,6 @@ fn from(impl_: clean::Impl) -> Self {
     }
 }
 
-<<<<<<< HEAD
 crate fn from_function_method(function: clean::Function, has_body: bool) -> Method {
     let clean::Function { header, decl, generics, all_types: _, ret_types: _ } = function;
     Method {