diff --git a/src/output.jl b/src/output.jl
index 27592eb4..085876fb 100644
--- a/src/output.jl
+++ b/src/output.jl
@@ -254,7 +254,6 @@ end
 # end
 #
 # html_output_format("svg")
-<<<<<<< HEAD
 
 
 # ---------------------------------------------------------
@@ -279,5 +278,3 @@ function showjuno(io::IO, m, plt)
     plt[:dpi] = dpi
     plt[:thickness_scaling] = thickness_scaling
 end
-=======
->>>>>>> 85b3aefd677c8c3adf6797cb2d85c1249cf631b8