fixing csproj merge conflict