diff --git a/tests/filter_str_tests.rs b/tests/filter_str_tests.rs
index fde3c77ee0..5c133f8b77 100644
--- a/tests/filter_str_tests.rs
+++ b/tests/filter_str_tests.rs
@@ -131,7 +131,11 @@ fn find_and_replaces() {
             cwd: dirs.test(), h::pipeline(
             r#"
                  open sample.toml
+<<<<<<< HEAD
                  | str fortune.teller.phone --find-replace [KATZ "5289"]
+=======
+                 | str fortune.teller.phone --find-replace [KATZ 5289]
+>>>>>>> 8cedd2e... replace and find-replace str plugin additions.
                  | get fortune.teller.phone
                  | echo $it
              "#
@@ -157,7 +161,11 @@ fn find_and_replaces_without_passing_field() {
             r#"
                  open sample.toml
                  | get fortune.teller.phone
+<<<<<<< HEAD
                  | str --find-replace [KATZ "5289"]
+=======
+                 | str --find-replace [KATZ 5289]
+>>>>>>> 8cedd2e... replace and find-replace str plugin additions.
                  | echo $it
              "#
         ));