Solve conflict

Author: buzkall

src/SelectTree.php

@@ -189,6 +189,7 @@ private function buildNode($result, $resultMap, $disabledOptions, $hiddenOptions
         $node = [
             'name' => $result->{$this->getTitleAttribute()},
             'value' => $key,
+            'parent' => $result->{$this->getParentAttribute()},
             'disabled' => in_array($key, $disabledOptions),
             'hidden' => in_array($key, $hiddenOptions),
         ];