fix conflicts

Author: gracekarina

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OpenAPIV3ParserTest.java

@@ -89,11 +89,9 @@ public void testIssue1561() {
         options.setResolve(true);
         SwaggerParseResult result = new OpenAPIV3Parser().readLocation("issue-1561/swagger.yaml", null, options);
         OpenAPI openAPI = result.getOpenAPI();
-        Yaml.prettyPrint(openAPI);
         assertTrue(openAPI.getComponents().getResponses().size() == 3);
     }
 
-
     @Test
     public void testAnonymousModelAllOf() {
         ParseOptions options = new ParseOptions();