fix csproj broken by git merge