Fixed merge issue
Fixed an auto merge issue with "NodeModel.CachedValue" property

Conflicts:
	src/DynamoCore/Models/NodeModel.cs