Fix merge issues in "Dynamo.All.2012.sln"