Remove old nushell/merge engine-q

crates/nu-command/tests/commands/str_/mod.rs

@@ -29,11 +29,7 @@ fn error_trim_multiple_chars() {
     let actual = nu!(
         cwd: ".", pipeline(
         r#"
-<<<<<<< HEAD
-        echo 'does it work now?!' | str trim -c '?!'
-=======
         echo "does it work now?!" | str trim -c "?!"
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
         "#
         )
     );
@@ -128,11 +124,7 @@ fn converts_to_int() {
         r#"
             echo '{number_as_string: "1"}'
             | from json
-<<<<<<< HEAD
-            | str to-int number_as_string
-=======
             | into int number_as_string
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
             | rename number
             | where number == 1
             | get number
@@ -150,11 +142,7 @@ fn converts_to_decimal() {
         r#"
             echo "3.1, 0.0415"
             | split row ","
-<<<<<<< HEAD
-            | str to-decimal
-=======
             | into decimal
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
             | math sum
         "#
     ));