diff --git a/src/state.rs b/src/state.rs
index 47d04fd..b7d0419 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -3,7 +3,11 @@ use serde::{Deserialize, Serialize};
 
 
 // use cosmwasm_std::Addr;
+<<<<<<< dev
 use cw_storage_plus::{Item, Map};
+=======
+// use cw_storage_plus::{Item, Map};
+>>>>>>> main
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub enum GameStatus {