Adding Nuget Packages
Fixing Merge issue