entityInBaseVersion = $entityInBaseVersion; } /** * @return Entity */ public function getEntityInBaseVersion() { return $this->entityInBaseVersion; } /** * @param Entity */ public function setEntityInWorkspace(Entity $entityInWorkspace) { $this->entityInWorkspace = $entityInWorkspace; } /** * @return Entity */ public function getEntityInWorkspace() { return $this->entityInWorkspace; } } // Adding a class alias for backwards compatibility with the previous class name. class_alias(MergeConflict::class, 'Google_Service_TagManager_MergeConflict');