fix merge error

src/app/components/components.module.ts

@@ -1,11 +1,13 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { HostComponent } from './editor/host/host.component';
+import {NodePickerComponent} from './editor/node-picker/node-picker.component';
+import {IonicModule} from '@ionic/angular';
 
 @NgModule({
-  declarations: [HostComponent],
-  imports: [CommonModule],
-  entryComponents: [HostComponent],
-  exports: [HostComponent]
+  declarations: [HostComponent, NodePickerComponent],
+  imports: [CommonModule, IonicModule],
+  entryComponents: [HostComponent, NodePickerComponent],
+  exports: [HostComponent, NodePickerComponent]
 })
 export class ComponentsModule {}

src/app/components/editor/node-picker/node-picker.component.html

@@ -0,0 +1,34 @@
+<ion-list>
+  <ion-item>
+    <ion-icon slot="start" name="menu"></ion-icon>
+    <ion-label>Paragraph</ion-label>
+  </ion-item>
+  <ion-item>
+    <ion-icon slot="start" name="alert"></ion-icon>
+    <ion-label>Heading 1</ion-label>
+  </ion-item>
+  <ion-item>
+    <ion-icon slot="start" name="alert"></ion-icon>
+    <ion-label>Heading 2</ion-label>
+  </ion-item>
+  <ion-item>
+    <ion-icon slot="start" name="alert"></ion-icon>
+    <ion-label>Heading 3</ion-label>
+  </ion-item>
+  <ion-item>
+    <ion-icon slot="start" name="alert"></ion-icon>
+    <ion-label>Heading 4</ion-label>
+  </ion-item>
+  <ion-item>
+    <ion-icon slot="start" name="code"></ion-icon>
+    <ion-label>Monospace Block</ion-label>
+  </ion-item>
+  <ion-item>
+    <ion-icon slot="start" name="link"></ion-icon>
+    <ion-label>Hyperlink</ion-label>
+  </ion-item>
+  <ion-item>
+    <ion-icon slot="start" name="analytics"></ion-icon>
+    <ion-label>Database</ion-label>
+  </ion-item>
+</ion-list>

src/app/components/editor/node-picker/node-picker.component.ts

@@ -0,0 +1,14 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'editor-node-picker',
+  templateUrl: './node-picker.component.html',
+  styleUrls: ['./node-picker.component.scss'],
+})
+export class NodePickerComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {}
+
+}