Fix broken csproj file

Git merge not particularly successful