diff --git a/test/plots.jl b/test/plots.jl
index 7501ff28..c892244f 100644
--- a/test/plots.jl
+++ b/test/plots.jl
@@ -14,7 +14,6 @@ using AstroImages: pix2world_xformatter, pix2world_yformatter
     @test getfield(rec[1], 1) == Dict{Symbol, Any}(:seriestype   => :heatmap,
                                                    :aspect_ratio => :equal,
                                                    :color        => :grays)
-<<<<<<< HEAD
     @test rec[1].args == (img.data,)
     
     rec = RecipesBase.apply_recipe(Dict{Symbol, Any}(), img, wcs1)
@@ -43,7 +42,6 @@ end
     
     @test pix2world_yformatter(255, wcs1) == "13.98°"
     @test pix2world_yformatter(255, wcs2) == 255.0
-=======
     @test rec[1].args == (img.data[1],)
 
     img = AstroImage((data,data,data))    
@@ -52,5 +50,4 @@ end
                                                    :aspect_ratio => :equal,
                                                    :color        => :grays)
     @test rec[1].args == (img.data[1],)
->>>>>>> 0827e23ac9e97cabdcc067d775350d4d4cc2aeb3
 end