Fix faulty conflict resolve

Author: timtebeek

src/main/resources/META-INF/rewrite/no-guava.yml

@@ -184,13 +184,6 @@ recipeList:
   - org.openrewrite.java.ChangeMethodTargetToStatic:
       methodPattern: com.google.common.base.Predicates not(com.google.common.base.Predicate)
       fullyQualifiedTargetTypeName: java.util.function.Predicate
-
-  - org.openrewrite.java.ChangeMethodName:
-      methodPattern: com.google.common.base.Predicates equalTo(..)
-      newMethodName: isEqual
-  - org.openrewrite.java.ChangeMethodTargetToStatic:
-      methodPattern: com.google.common.base.Predicates isEqual(..)
-      fullyQualifiedTargetTypeName: java.util.function.Predicate
   - org.openrewrite.java.migrate.guava.NoGuavaPredicate
 
 ---

src/test/java/org/openrewrite/java/migrate/guava/PreferJavaUtilPredicateTest.java

@@ -102,34 +102,6 @@ public static Predicate<String> notEmptyPredicate() {
         );
     }
 
-    @Test
-    void predicatesEqualToToPredicateIsEqual() {
-        rewriteRun(
-          //language=java
-          java(
-            """
-              import com.google.common.base.Predicate;
-              import com.google.common.base.Predicates;
-
-              class A {
-                  public static Predicate<String> isHelloPredicate() {
-                      return Predicates.equalTo("hello");
-                  }
-              }
-              """,
-            """
-              import java.util.function.Predicate;
-
-              class A {
-                  public static Predicate<String> isHelloPredicate() {
-                      return Predicate.isEqual("hello");
-                  }
-              }
-              """
-          )
-        );
-    }
-
     @Issue("https://github.com/openrewrite/rewrite-migrate-java/issues/899")
     @Test
     void doNotChangeWhenUsingCollectionsFilter() {