diff --git a/python/util/db_conn.py b/python/util/db_conn.py
index 4af9168af..3c72ee324 100644
--- a/python/util/db_conn.py
+++ b/python/util/db_conn.py
@@ -49,7 +49,11 @@ class Postgres(object):
                 cur = self.conn.cursor()
                 cur.execute(sql)
                 updated_rows = cur.rowcount
+<<<<<<< HEAD
                 self.conn.commit()
+=======
+                conn.commit()
+>>>>>>> upstream/main
                 cur.close()
                 return updated_rows
             except Exception as e:
diff --git a/src/api/doc_info.rs b/src/api/doc_info.rs
index 1c6f89f9b..44102bd4c 100644
--- a/src/api/doc_info.rs
+++ b/src/api/doc_info.rs
@@ -142,7 +142,6 @@ async fn mv(params: web::Json<MvParams>, data: web::Data<AppState>) -> Result<Ht
         .body(serde_json::to_string(&json_response)?))
 }
 
-
 #[derive(Debug, Deserialize)]
 pub struct NewFoldParams {
     pub uid: i64,
diff --git a/src/api/tag.rs b/src/api/tag.rs
new file mode 100644
index 000000000..b902f3d3a
--- /dev/null
+++ b/src/api/tag.rs
@@ -0,0 +1,58 @@
+use std::collections::HashMap;
+use actix_web::{get, HttpResponse, post, web};
+use actix_web::http::Error;
+use crate::api::JsonResponse;
+use crate::AppState;
+use crate::entity::tag_info;
+use crate::service::tag_info::{Mutation, Query};
+
+#[post("/v1.0/create_tag")]
+async fn create(model: web::Json<tag_info::Model>, data: web::Data<AppState>) -> Result<HttpResponse, Error> {
+    let model = Mutation::create_tag(&data.conn, model.into_inner()).await.unwrap();
+
+    let mut result = HashMap::new();
+    result.insert("tid", model.tid.unwrap());
+
+    let json_response = JsonResponse {
+        code: 200,
+        err: "".to_owned(),
+        data: result,
+    };
+
+    Ok(HttpResponse::Ok()
+        .content_type("application/json")
+        .body(serde_json::to_string(&json_response).unwrap()))
+}
+
+#[post("/v1.0/delete_tag")]
+async fn delete(model: web::Json<tag_info::Model>, data: web::Data<AppState>) -> Result<HttpResponse, Error> {
+    let _ = Mutation::delete_tag(&data.conn, model.tid).await.unwrap();
+
+    let json_response = JsonResponse {
+        code: 200,
+        err: "".to_owned(),
+        data: (),
+    };
+
+    Ok(HttpResponse::Ok()
+        .content_type("application/json")
+        .body(serde_json::to_string(&json_response).unwrap()))
+}
+
+#[get("/v1.0/tags")]
+async fn list(data: web::Data<AppState>) -> Result<HttpResponse, Error> {
+    let tags = Query::find_tag_infos(&data.conn).await.unwrap();
+
+    let mut result = HashMap::new();
+    result.insert("tags", tags);
+
+    let json_response = JsonResponse {
+        code: 200,
+        err: "".to_owned(),
+        data: result,
+    };
+
+    Ok(HttpResponse::Ok()
+        .content_type("application/json")
+        .body(serde_json::to_string(&json_response).unwrap()))
+}
\ No newline at end of file
diff --git a/src/entity/kb2_doc.rs b/src/entity/kb2_doc.rs
index 53df21570..0c0522fc3 100644
--- a/src/entity/kb2_doc.rs
+++ b/src/entity/kb2_doc.rs
@@ -11,6 +11,7 @@ pub struct Model {
     pub kb_id: i64,
     #[sea_orm(index)]
     pub did: i64,
+<<<<<<< HEAD
     #[serde(skip_deserializing)]
     pub kb_progress: f32,
     #[serde(skip_deserializing)]
@@ -19,6 +20,8 @@ pub struct Model {
     pub updated_at: DateTime<FixedOffset>,
     #[serde(skip_deserializing)]
     pub is_deleted: bool,
+=======
+>>>>>>> upstream/main
 }
 
 #[derive(Debug, Clone, Copy, EnumIter)]
diff --git a/src/entity/tag_info.rs b/src/entity/tag_info.rs
index 7d6a94961..107472646 100644
--- a/src/entity/tag_info.rs
+++ b/src/entity/tag_info.rs
@@ -11,12 +11,19 @@ pub struct Model {
     #[sea_orm(index)]
     pub uid: i64,
     pub tag_name: String,
+<<<<<<< HEAD
     #[serde(skip_deserializing)]
     pub regx: String,
     pub color: i16,
     pub icon: i16,
     #[serde(skip_deserializing)]
     pub folder_id: i64,
+=======
+    pub regx: Option<String>,
+    pub color: u16,
+    pub icon: u16,
+    pub dir: Option<String>,
+>>>>>>> upstream/main
 
     #[serde(skip_deserializing)]
     pub created_at: DateTime<FixedOffset>,
diff --git a/src/main.rs b/src/main.rs
index 8f402d83c..94e9a6ffd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -98,8 +98,11 @@ fn init(cfg: &mut web::ServiceConfig) {
     cfg.service(api::kb_info::delete);
     cfg.service(api::kb_info::list);
     cfg.service(api::kb_info::add_docs_to_kb);
+<<<<<<< HEAD
     cfg.service(api::kb_info::anti_kb_docs);
     cfg.service(api::kb_info::all_relevents);
+=======
+>>>>>>> upstream/main
 
     cfg.service(api::doc_info::list);
     cfg.service(api::doc_info::delete);
diff --git a/src/service/kb_info.rs b/src/service/kb_info.rs
index 36ceba581..090a79277 100644
--- a/src/service/kb_info.rs
+++ b/src/service/kb_info.rs
@@ -162,4 +162,4 @@ impl Mutation {
     pub async fn delete_all_kb_infos(db: &DbConn) -> Result<DeleteResult, DbErr> {
         Entity::delete_many().exec(db).await
     }
-}
\ No newline at end of file
+}