chore: fix conflict

src/msg/execute_msg.rs

@@ -42,28 +42,45 @@ pub enum ExecuteMsg {
         id: u64,
     },
     StakeRequest {
+<<<<<<< HEAD
+=======
+        address: String,
+>>>>>>> 852e71b (chore: add execution functions)
         amount: u64,
         asset: String,
         validator_address: Option<String>,
     },
     UnstakeRequest {
+<<<<<<< HEAD
+=======
+        address: String,
+>>>>>>> 852e71b (chore: add execution functions)
         amount: u64,
         asset: String,
         validator_address: Option<String>,
     },
     ElysRedelegateRequest {
+<<<<<<< HEAD
+=======
+        delegator_address:    String,
+>>>>>>> 852e71b (chore: add execution functions)
         validator_src_address: String,
         validator_dst_address: String,
         amount:              Coin,
     },
     ElysCancelUnstakeRequest {
+<<<<<<< HEAD
+=======
+        delegator_address: String,
+>>>>>>> 852e71b (chore: add execution functions)
         validator_address: String,
         // amount is always less than or equal to unbonding delegation entry balance
         amount: Coin,
         // creation_height is the height which the unbonding took place.
         creation_height: i64,
     },
     EdenVestRequest {
+<<<<<<< HEAD
         amount:  u64,
     },
     EdenCancelVestRequest {
@@ -73,6 +90,21 @@ pub enum ExecuteMsg {
         withdraw_type: EarnType,
     },
     ClaimValidatorCommissionRequest {
+=======
+        creator: String,
+        amount:  u64,
+    },
+    EdenCancelVestRequest {
+        creator: String,
+        amount:  u64,
+    },
+    ClaimRewardsRequest {
+        delegator_address: String,
+        withdraw_type: EarnType,
+    },
+    ClaimValidatorCommissionRequest {
+        delegator_address: String,
+>>>>>>> 852e71b (chore: add execution functions)
         validator_address: String,
     }
 }

src/types/earn_type.rs

@@ -0,0 +1,10 @@
+use cosmwasm_schema::cw_serde;
+
+#[cw_serde]
+pub enum EarnType {
+    AllProgram = 0,
+	UsdcProgram = 1,
+	ElysProgram = 2,
+	EdenProgram = 3,
+	EdenBProgram = 4,
+}

src/types/mod.rs

@@ -13,6 +13,7 @@ mod margin_order;
 mod margin_order_type;
 mod reply_info;
 mod status;
+mod earn_type;
 
 pub use date::Date;
 pub use elys_bindings::types::*;
@@ -23,3 +24,4 @@ pub use spot_order::spot_order::SpotOrder;
 pub use spot_order_price::OrderPrice;
 pub use spot_order_type::SpotOrderType;
 pub use status::Status;
+pub use earn_type::EarnType;