fix conflicts missed on last commit

Author: ericnewton76

tests/CommandLine.Tests/Unit/Core/InstanceBuilderTests.cs

@@ -994,7 +994,7 @@ public void Parse_option_with_exception_thrown_from_setter_generates_SetValueExc
                 new[] { "-e", "bad" });
 
             // Verify outcome
-            ((NotParsed<Options_With_Property_Throwing_Exception>)result).Errors.ShouldBeEquivalentTo(expectedResult);
+            ((NotParsed<Options_With_Property_Throwing_Exception>)result).Errors.Should().BeEquivalentTo(expectedResult);
 
             // Teardown
         }
@@ -1050,7 +1050,7 @@ public void Parse_TimeSpan()
                 new[] { "--duration=00:42:00" });
 
             // Verify outcome
-            expectedResult.ShouldBeEquivalentTo(((Parsed<Options_With_TimeSpan>)result).Value);
+            expectedResult.Should().BeEquivalentTo(((Parsed<Options_With_TimeSpan>)result).Value);
 
             // Teardown
         }

tests/CommandLine.Tests/Unit/UnParserExtensionsTests.cs

@@ -44,7 +44,7 @@ public static void Unparsing_hidden_option_returns_command_line(Hidden_Option op
         {
             new Parser()
                 .FormatCommandLine(options, config => config.ShowHidden = showHidden)
-                .ShouldBeEquivalentTo(result);
+                .Should().BeEquivalentTo(result);
         }
 
 #if !SKIP_FSHARP
@@ -148,7 +148,7 @@ public static IEnumerable<object[]> UnParseDataImmutable
             }
         }
 
-        public static IEnumerable<object> UnParseDataHidden
+        public static IEnumerable<object[]> UnParseDataHidden
         {
             get
             {