Fixed merged conflic issues

Author: rg911

src/model/namespace/AliasAction.ts

@@ -19,7 +19,7 @@
  * 0: Link an alias.
  * 1: Unlink an alias.
  */
-export enum AliasActionType {
+export enum AliasAction {
     Link = 0x01,
     Unlink = 0x00,
 }

src/model/transaction/AddressAliasTransaction.ts

@@ -134,7 +134,7 @@ export class AddressAliasTransaction extends Transaction {
             TransactionType.ADDRESS_ALIAS.valueOf(),
             new AmountDto(this.maxFee.toDTO()),
             new TimestampDto(this.deadline.toDTO()),
-            this.actionType.valueOf(),
+            this.aliasAction.valueOf(),
             new NamespaceIdDto(this.namespaceId.id.toDTO()),
             new AddressDto(RawAddress.stringToAddress(this.address.plain())),
         );
@@ -150,7 +150,7 @@ export class AddressAliasTransaction extends Transaction {
             new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
             this.versionToDTO(),
             TransactionType.ADDRESS_ALIAS.valueOf(),
-            this.actionType.valueOf(),
+            this.aliasAction.valueOf(),
             new NamespaceIdDto(this.namespaceId.id.toDTO()),
             new AddressDto(RawAddress.stringToAddress(this.address.plain())),
         );

src/model/transaction/ModifyMultisigAccountTransaction.ts

@@ -142,7 +142,7 @@ export class ModifyMultisigAccountTransaction extends Transaction {
             this.minApprovalDelta,
             this.modifications.map((modification) => {
                 return new CosignatoryModificationBuilder(
-                    modification.type.valueOf(),
+                    modification.modificiationType.valueOf(),
                     new KeyDto(Convert.hexToUint8(modification.cosignatoryPublicAccount.publicKey)),
                 );
             }),
@@ -163,7 +163,7 @@ export class ModifyMultisigAccountTransaction extends Transaction {
             this.minApprovalDelta,
             this.modifications.map((modification) => {
                 return new CosignatoryModificationBuilder(
-                    modification.type.valueOf(),
+                    modification.modificiationType.valueOf(),
                     new KeyDto(Convert.hexToUint8(modification.cosignatoryPublicAccount.publicKey)),
                 );
             }),

src/model/transaction/MosaicAliasTransaction.ts

@@ -130,7 +130,7 @@ export class MosaicAliasTransaction extends Transaction {
             TransactionType.MOSAIC_ALIAS.valueOf(),
             new AmountDto(this.maxFee.toDTO()),
             new TimestampDto(this.deadline.toDTO()),
-            this.actionType.valueOf(),
+            this.aliasAction.valueOf(),
             new NamespaceIdDto(this.namespaceId.id.toDTO()),
             new MosaicIdDto(this.mosaicId.id.toDTO()),
         );
@@ -146,7 +146,7 @@ export class MosaicAliasTransaction extends Transaction {
             new KeyDto(Convert.hexToUint8(this.signer!.publicKey)),
             this.versionToDTO(),
             TransactionType.MOSAIC_ALIAS.valueOf(),
-            this.actionType.valueOf(),
+            this.aliasAction.valueOf(),
             new NamespaceIdDto(this.namespaceId.id.toDTO()),
             new MosaicIdDto(this.mosaicId.id.toDTO()),
         );