fix conlicts

src/app/_modules/pages/menu/pages-menu.component.html

@@ -1,8 +1,9 @@
-<pages-menu-item
-  (click)="close()"
-  (onSelected)="itemSelect($event)"
-  (mouseleave)="leave()"
-  [class.hidden]="hidden"
-  [item]="item"
-  *ngFor="let item of visibleItems"
-></pages-menu-item>
+<pages-menu-item 
+  (click)="setHover(i,!hover[i])" 
+  (mouseleave)="setHover(i,false)" 
+  (mouseover)="setHover(i,true)" 
+  (onSelected)="itemSelect($event)" 
+  [class.hover]="hover[i]" 
+  [class.depth]="getDepth(item)>=2" 
+  [item]="item" *ngFor="let item of visibleItems; let i=index;">
+</pages-menu-item>

src/app/_modules/pages/page/page.component.ts

@@ -49,16 +49,15 @@ export class PageComponent {
         name= item?.name;
       }    
     }
-    return name||this.page.name;    
+    name = name||this.page.name;
+    return name;    
   }
 
-  ngOnInit() {
-    
+  ngAfterContentInit() {    
     this.listsService.controls().subscribe(res => {
       this.inited ? this.fetch() : this.inited = true;
       this.fetchMenu();
-    });
-    
+    });    
   }
 
   ngOnDestroy() {