Fix for merge issue with AssemblyInfo.cs.