Resolve merge conflicts5

Author: DashProsh

app/src/main/java/hexlet/code/formatters/Plain.java

@@ -23,7 +23,7 @@ public static String format(List<Map<String, Object>> diff) {
                 default -> { }
             }
         }
-        return result.toString();
+        return result.toString().strip();
     }
 
     private static String formatValue(Object value) {

app/src/main/java/hexlet/code/formatters/Stylish.java

@@ -27,6 +27,6 @@ public static String format(List<Map<String, Object>> diff) {
         }
 
         result.append("}\n");
-        return result.toString();
+        return result.toString().strip();
     }
 }