Fix merge conflict

Author: ayoung

RestSharp.Tests/JsonTests.cs

@@ -324,6 +324,20 @@ public void Can_Deserialize_With_Default_Root_Alternative_Culture()
 			}
 		}
 
+		[Fact]
+		public void Can_Deserialize_Names_With_Underscore_Prefix()
+		{
+			var data = File.ReadAllText(Path.Combine("SampleData", "underscore_prefix.txt"));
+			var response = new RestResponse { Content = data };
+			var json = new JsonDeserializer();
+			json.RootElement = "User";
+
+			var output = json.Deserialize<SOUser>(response);
+
+			Assert.Equal("John Sheehan", output.DisplayName);
+			Assert.Equal(1786, output.Id);
+		}
+
 		[Fact]
 		public void Can_Deserialize_Names_With_Underscores_With_Default_Root()
 		{

RestSharp.Tests/RestSharp.Tests.csproj

@@ -113,6 +113,7 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="SampleData\iso8601datetimes.txt">
+    <Content Include="SampleData\underscore_prefix.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="SampleData\datetimes.txt">

RestSharp.Tests/SampleData/underscore_prefix.txt

@@ -0,0 +1,18 @@
+{
+   "User":{
+      "_id":1786,
+      "_displayName":"John Sheehan",
+      "Reputation":18332,
+      "CreationDate":1219071163,
+      "_displayName":"John Sheehan",
+      "EmailHash":"lkdsafadfjsadfkjlsdjflkjdsf",
+      "Age":"28",
+      "LastAccessDate":1269715453,
+      "WebsiteUrl":"http://john-sheehan.com/blog",
+      "Location":"Minnesota",
+      "AboutMe":"<h2><a href=\"http://twitter.com/johnsheehan\" rel=\"nofollow\">Follow me on Twitter</a></h2>\r\n\r\n<h2><a href=\"http://john-sheehan.com/blog\" rel=\"nofollow\">Read my blog</a></h2>\r\n\r\n<h2>Visit <a href=\"http://managedassembly.com\" rel=\"nofollow\">managedassembly.com</a> - A community for .NET developers.</h2>\r\n\r\n<p>I am the founder of <a href=\"http://rimsystems.com\" rel=\"nofollow\">RIM Systems</a>, maker of <a href=\"http://snapleague.com\" rel=\"nofollow\">SnapLeague</a>, a web-based league management system for recreational athletics.</p>",
+      "Views":1639,
+      "UpVotes":1665,
+      "DownVotes":427
+   }
+}

RestSharp/Extensions/StringExtensions.cs

@@ -309,6 +309,16 @@ public static string AddDashes(this string pascalCasedWord)
 				"$1-$2"), @"[\s]", "-");
 		}
 
+		/// <summary>
+		/// Add an undescore prefix to a pascasl-cased string
+		/// </summary>
+		/// <param name="pascalCasedWord"></param>
+		/// <returns></returns>
+		public static string AddUnderscorePrefix(this string pascalCasedWord)
+		{
+			return string.Format("_{0}", pascalCasedWord);
+		}
+
 		/// <summary>
 		/// Return possible variants of a name for name matching.
 		/// </summary>
@@ -339,6 +349,12 @@ public static IEnumerable<string> GetNameVariants(this string name, CultureInfo
 
 			// try name with dashes with lower case
 			yield return name.AddDashes().ToLower(culture);
+
+			// try name with underscore prefix
+			yield return name.AddUnderscorePrefix();
+
+			// try name with underscore prefix, using camel case
+			yield return name.ToCamelCase(culture).AddUnderscorePrefix();
 		}
 	}
 }