chore(): resolve merge conflicts

angular/test/test-app/src/app/modal/modal.component.ts

@@ -27,6 +27,7 @@ export class ModalComponent {
   async open(TheModalComponent: any) {
     const modal = await this.modalCtrl.create({
       component: TheModalComponent,
+      animated: false,
       componentProps: {
         value: '123',
         prop: '321'
@@ -40,7 +41,7 @@ export class ModalComponent {
     modal.onDidDismiss().then(() => {
       NgZone.assertInAngularZone();
       if (!this.onWillDismiss) {
-        throw new Error('onWillDismiss should be emited first');
+        throw new Error('onWillDismiss should be emitted first');
       }
       this.onDidDismiss = true;
     });