diff --git a/unilabos/devices/workstation/bioyond_studio/bioyond_cell/bioyond_yihua_YB.json b/unilabos/devices/workstation/bioyond_studio/bioyond_cell/bioyond_yihua_YB.json
index 81e1ee78..3d1b98af 100644
--- a/unilabos/devices/workstation/bioyond_studio/bioyond_cell/bioyond_yihua_YB.json
+++ b/unilabos/devices/workstation/bioyond_studio/bioyond_cell/bioyond_yihua_YB.json
@@ -11,10 +11,6 @@
       "config": {
           "protocol_type": [],
           "station_resource": {}
-<<<<<<< Updated upstream
-
-=======
->>>>>>> Stashed changes
 
       },
       "data": {}