diff --git a/src/mlpack/methods/rann/ra_model_impl.hpp b/src/mlpack/methods/rann/ra_model_impl.hpp
index d7a27cb5d8..390de0943e 100644
--- a/src/mlpack/methods/rann/ra_model_impl.hpp
+++ b/src/mlpack/methods/rann/ra_model_impl.hpp
@@ -453,10 +453,7 @@ void RAModel<SortPolicy>::Search(arma::mat&& querySet,
     Log::Info << "single-tree rank-approximate " << TreeName() << " search...";
   else
     Log::Info << "brute-force (naive) rank-approximate search...";
-<<<<<<< HEAD
-=======
   Log::Info << std::endl;
->>>>>>> f535c29999c3d57b06664cceb871b5c937666586
 
   switch (treeType)
   {
@@ -518,10 +515,7 @@ void RAModel<SortPolicy>::Search(const size_t k,
     Log::Info << "single-tree rank-approximate " << TreeName() << " search...";
   else
     Log::Info << "brute-force (naive) rank-approximate search...";
-<<<<<<< HEAD
-=======
   Log::Info << std::endl;
->>>>>>> f535c29999c3d57b06664cceb871b5c937666586
 
   switch (treeType)
   {