Fix .csproj files that were incorrectly merged