Pr 1613 updated

The extra whitespace in the csproj files was the result of a conflict area on a line that had incorrect line endings.