Removed unnecessary files from NuGetPackage
Pull conflict resolution
Updated releasenotes and readme