Bump to 1.7; fix stray merge conflict

Author: shashi

Project.toml

@@ -1,7 +1,7 @@
 name = "SymbolicUtils"
 uuid = "d1185830-fcd6-423d-90d6-eec64667417b"
 authors = ["Shashi Gowda"]
-version = "1.5.1"
+version = "1.7.0"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"

src/rewriters.jl

@@ -200,16 +200,12 @@ function (p::Walk{ord, C, F, false})(x) where {ord, C, F}
         if ord === :pre
             x = p.rw(x)
         end
-<<<<<<< HEAD
 
-        x = p.similarterm(x, operation(x), map(PassThrough(p),
-                        unsorted_arguments(x)), metadata=metadata(x))
-
-=======
         if istree(x)
-            x = p.similarterm(x, operation(x), map(PassThrough(p), unsorted_arguments(x)))
+            x = p.similarterm(x, operation(x), map(PassThrough(p),
+                            unsorted_arguments(x)), metadata=metadata(x))
         end
->>>>>>> parent of 6713fa0 (Merge pull request #584 from JuliaSymbolics/ale/terminterface-new)
+
         return ord === :post ? p.rw(x) : x
     else
         return p.rw(x)