diff --git a/test/imgcomp.jl b/test/imgcomp.jl
index e7151573..96f41809 100644
--- a/test/imgcomp.jl
+++ b/test/imgcomp.jl
@@ -14,6 +14,7 @@ function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = !i
     fn = "ref$idx.png"
     reffn = reference_file(pkg, idx, _current_plots_version)
     newfn = joinpath(reference_path(pkg, _current_plots_version), fn)
+>>>>>>> use PlotReferenceImages Julia Package for tests
 
     # test function
     func = (fn, idx) -> begin
diff --git a/test/runtests.jl b/test/runtests.jl
index a04d0fda..4e64928f 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -6,6 +6,7 @@ using FileIO
 using PlotReferenceImages
 using Gtk
 
+>>>>>>> use PlotReferenceImages Julia Package for tests
 
 include("imgcomp.jl")
 # don't actually show the plots