show conflicts unification;

encapsulate fields: rise conflicts; tests

java/java-tests/testData/refactoring/removemiddleman/interface/after/Test.java

@@ -1,3 +1,6 @@
 class Test implements I {
   A myField;
+  void foo() {
+    myField.foo();
+  }
 }

java/java-tests/testData/refactoring/removemiddleman/interfaceDelegation/after/Test.java

@@ -4,7 +4,11 @@ class Test implements I {
     return myField;
   }
 
-    void bar(I i) {
+  void foo() {
+    myField.foo();
+  }
+
+  void bar(I i) {
     i.foo();
   }
 }

java/java-tests/testData/refactoring/removemiddleman/presentGetter/after/Test.java

@@ -4,7 +4,11 @@ class Test implements I {
     return myField;
   }
 
-    void bar(I i) {
+  void foo() {
+    myField.foo();
+  }
+
+  void bar(I i) {
     i.foo();
   }
 }

java/java-tests/testData/refactoring/removemiddleman/siblings/after/D.java

@@ -6,6 +6,6 @@ class D {
   }
 
   void bazz(Test t){
-      t.getMyField().foo();
+    t.foo();
   }
 }

java/java-tests/testData/refactoring/removemiddleman/siblings/after/Test.java

@@ -1,11 +1,10 @@
 class Test extends A {
   D myField;
-
-    void ff(){
-        myField.foo();
+  void foo(){
+    myField.foo();
   }
 
-    public D getMyField() {
-        return myField;
-    }
+  void ff(){
+    foo();
+  }
 }