Fixed a merge error in the csproj