diff --git a/app/run.py b/app/run.py
index 65cc852..e954351 100644
--- a/app/run.py
+++ b/app/run.py
@@ -7,10 +7,14 @@ from typing import List, Dict, Union
 from flask import Flask, request
 from flask.helpers import get_env
 from flask_sockets import Sockets
-from app.configs.global_var import _init
+
 
 import sys 
+<<<<<<< HEAD
 sys.path.append("/mnt/sdc/algorithm/R-ODY")
+=======
+sys.path.append("/mnt/sdc/algorithm/AICheck-MaskRCNN")
+>>>>>>> 168c803f56a54a8da33a41e91459154b9abe9dbd
 # sys.path.append('E:/alg_demo-master/alg_demo/app/yolov5')
 from app.core.common_utils import logger
 from app.core.err_handler import page_not_found, method_not_allowed, exception_500, exception_400
@@ -18,6 +22,7 @@ from app.core.err_handler import page_not_found, method_not_allowed, exception_5
 from app.exts import db, migrate, ma
 from app.utils.redis_config import redis_client
 from app.utils.websocket_tool import manager
+from app.configs.global_var import _init
 
 
 def register_extensions(app):
diff --git a/app/yolov5/data/coco128.yaml b/app/yolov5/data/coco128.yaml
index 92dfe61..8891e4d 100644
--- a/app/yolov5/data/coco128.yaml
+++ b/app/yolov5/data/coco128.yaml
@@ -1,7 +1,9 @@
 path: null
-train: /mnt/sdc/aicheck/IntelligentizeAI/data_set/114421361786626048/trained/images/train/
-val: /mnt/sdc/aicheck/IntelligentizeAI/data_set/114421361786626048/trained/images/val/
+train: /mnt/sdc/IntelligentizeAI/IntelligentizeAI/data_set/190857268466688000/trained/images/train/
+val: /mnt/sdc/IntelligentizeAI/IntelligentizeAI/data_set/190857268466688000/trained/images/val/
 test: null
 names:
   0: hole
   1: '456'
+  2: zui
+  3: mianbang
diff --git a/nohup.out b/nohup.out
index d74bbf6..2a99c76 100644
Binary files a/nohup.out and b/nohup.out differ
diff --git a/tpid b/tpid
index d24fafb..8d884e8 100644
--- a/tpid
+++ b/tpid
@@ -1 +1 @@
-2544346
+2956744