fix merge conflict

SharedVersion.cs

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