src/app/n2n/impl/persistence/orm/property/ToOneEntityProperty.php
public function mergeValue($value, $sameEntity, MergeOperation $mergeOperation) {
		if ($value === null) return null;
				
		if ($this->relation->getCascadeType() & CascadeType::MERGE) {
			return $mergeOperation->mergeEntity($value);
		}
		
		return $value;
	}
public function mergeValue($value, $sameEntity, MergeOperation $mergeOperation) {
		if ($value === null) return null;
				
		if ($this->relation->getCascadeType() & CascadeType::MERGE) {
			return $mergeOperation->mergeEntity($value);
		}
		
		return $value;
	}
/* (non-PHPdoc)
@see \n2n\persistence\orm\property\EntityProperty::mergeValue()