fix merge conflict

SharedVersion.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
-//[assembly: AssemblyVersion("3.1.*")]
-[assembly: AssemblyVersion("3.1.106")]
+[assembly: AssemblyVersion("3.1.*")]
+//[assembly: AssemblyVersion("3.0.6060")]