fix merge error

nncase.sln

@@ -175,17 +175,14 @@ Global
 		{E6462E82-B48F-4AFA-AE34-725EF0A9CB42}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E6462E82-B48F-4AFA-AE34-725EF0A9CB42}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E6462E82-B48F-4AFA-AE34-725EF0A9CB42}.Release|Any CPU.Build.0 = Release|Any CPU
-<<<<<<< HEAD
 		{FA535CB0-C8B9-4CA5-B3E3-8B7912E5F061}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FA535CB0-C8B9-4CA5-B3E3-8B7912E5F061}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FA535CB0-C8B9-4CA5-B3E3-8B7912E5F061}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FA535CB0-C8B9-4CA5-B3E3-8B7912E5F061}.Release|Any CPU.Build.0 = Release|Any CPU
-=======
 		{B9A09DA2-EF1A-4C0E-A0F5-427AFBB5C769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B9A09DA2-EF1A-4C0E-A0F5-427AFBB5C769}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B9A09DA2-EF1A-4C0E-A0F5-427AFBB5C769}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B9A09DA2-EF1A-4C0E-A0F5-427AFBB5C769}.Release|Any CPU.Build.0 = Release|Any CPU
->>>>>>> master
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -216,11 +213,8 @@ Global
 		{E365B1B1-4D13-4839-9763-A7A7C5F32FD4} = {BCA74168-F015-4B5B-B4CD-C83AE06B9822}
 		{98A03405-CA53-4EC4-9B18-94D1C8DF9453} = {E5A4516C-4080-4346-991D-57A7AA76ADA6}
 		{E6462E82-B48F-4AFA-AE34-725EF0A9CB42} = {BCA74168-F015-4B5B-B4CD-C83AE06B9822}
-<<<<<<< HEAD
 		{FA535CB0-C8B9-4CA5-B3E3-8B7912E5F061} = {9859F5E8-5504-4AFE-B955-9497A0A0CD66}
-=======
 		{B9A09DA2-EF1A-4C0E-A0F5-427AFBB5C769} = {BCA74168-F015-4B5B-B4CD-C83AE06B9822}
->>>>>>> master
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9492E141-292E-4D60-9C6E-3738AB234DB2}