fix merge conflicts

x/auth/test_common.go

@@ -25,8 +25,8 @@ type testInput struct {
 // moduleAccount defines an account for modules that holds coins on a pool
 type moduleAccount struct {
 	*types.BaseAccount
-	name        string   `json:"name"`        // name of the module
-	permissions []string `json:"permissions"` // permissions of module account (minter/burner/holder)
+	name        string   `json:"name" yaml:"name"`              // name of the module
+	permissions []string `json:"permissions" yaml"permissions"` // permissions of module account
 }
 
 // HasPermission returns whether or not the module account has permission.

x/genaccounts/genesis_account.go

@@ -27,8 +27,8 @@ type GenesisAccount struct {
 	EndTime          int64     `json:"end_time" yaml:"end_time"`                   // vesting end time (UNIX Epoch time)
 
 	// module account fields
-	ModuleName        string   `json:"module_name"`        // name of the module account
-	ModulePermissions []string `json:"module_permissions"` // permissions of module account
+	ModuleName        string   `json:"module_name" yaml:"module_name"`               // name of the module account
+	ModulePermissions []string `json:"module_permissions" yaml:"module_permissions"` // permissions of module account
 }
 
 // Validate checks for errors on the vesting and module account parameters

x/supply/internal/types/account.go

@@ -17,8 +17,8 @@ var _ exported.ModuleAccountI = (*ModuleAccount)(nil)
 // ModuleAccount defines an account for modules that holds coins on a pool
 type ModuleAccount struct {
 	*authtypes.BaseAccount
-	Name        string   `json:"name"`        // name of the module
-	Permissions []string `json:"permissions"` // permissions of module account
+	Name        string   `json:"name" yaml:"name"`               // name of the module
+	Permissions []string `json:"permissions" yaml:"permissions"` // permissions of module account
 }
 
 // NewModuleAddress creates an AccAddress from the hash of the module's name