karinas
karina commit csproj
csproj conflict
some upgradelog