added nuget
merge
fixed merge