diff --git a/.github/workflows/deploy_workflow.yaml b/.github/workflows/deploy_workflow.yaml
index 5a1d83da0..3cf837619 100644
--- a/.github/workflows/deploy_workflow.yaml
+++ b/.github/workflows/deploy_workflow.yaml
@@ -56,6 +56,7 @@ jobs:
           point_painting,
           prometheus_ros,
           protolink,
+          protolink_drivers,
           quaternion_operation,
           robotx_behavior_tree,
           robotx_communication,
diff --git a/ansible/roles/clone_packages/tasks/main.yml b/ansible/roles/clone_packages/tasks/main.yml
index c1fa199ea..083abe0f9 100644
--- a/ansible/roles/clone_packages/tasks/main.yml
+++ b/ansible/roles/clone_packages/tasks/main.yml
@@ -186,13 +186,6 @@
     version: master
     accept_hostkey: yes
   tags: [utility]
-- name: clone protolink
-  git:
-    repo: https://github.com/OUXT-Polaris/protolink.git
-    dest: "{{workspace_path}}/src/drivers/protolink"
-    version: master
-    accept_hostkey: yes
-  tags: [utility]
 
 # Description Packages
 - name: clone wamv_description
@@ -260,6 +253,20 @@
     dest: "{{workspace_path}}/src/drivers/playstation_joy_interfaces"
     version: humble
     accept_hostkey: yes
+- name: clone protolink
+  git:
+    repo: https://github.com/OUXT-Polaris/protolink.git
+    dest: "{{workspace_path}}/src/drivers/protolink"
+    version: master
+    accept_hostkey: yes
+  tags: [driver]
+- name: clone protolink_drivers
+  git:
+    repo: https://github.com/OUXT-Polaris/protolink_drivers.git
+    dest: "{{workspace_path}}/src/drivers/protolink_drivers"
+    version: master
+    accept_hostkey: yes
+  tags: [driver]
 
 # Control Package
 - name: clone usv_controller package
diff --git a/create_container.sh b/create_container.sh
old mode 100755
new mode 100644
diff --git a/delete_container.sh b/delete_container.sh
old mode 100755
new mode 100644
diff --git a/docker/create_container.sh b/docker/create_container.sh
old mode 100755
new mode 100644
diff --git a/docker/delete_container.sh b/docker/delete_container.sh
old mode 100755
new mode 100644
diff --git a/docker/robotx_ws_docker.sh b/docker/robotx_ws_docker.sh
old mode 100755
new mode 100644
diff --git a/docs/docs/packages.md b/docs/docs/packages.md
index 1ec3e3e1a..3d1d4b2e2 100644
--- a/docs/docs/packages.md
+++ b/docs/docs/packages.md
@@ -2,4 +2,4 @@
 
 ## dashboard
 
-@github_dashboard(OUXT-Polaris/color_names,OUXT-Polaris/data_buffer,OUXT-Polaris/detic_onnx_ros2,OUXT-Polaris/geographic_conversion,OUXT-Polaris/geographic_info,OUXT-Polaris/grid_map_type_adapter,OUXT-Polaris/hermite_path_planner,OUXT-Polaris/image_processing_utils,OUXT-Polaris/joy_to_twist,OUXT-Polaris/lua_vendor,OUXT-Polaris/message_synchronizer,OUXT-Polaris/navi_sim,OUXT-Polaris/nmea_hardware_interface,OUXT-Polaris/nmea_to_geopose,OUXT-Polaris/odom_frame_publisher,OUXT-Polaris/ouxt_common,OUXT-Polaris/pcl_apps,OUXT-Polaris/pcl_type_adapter,OUXT-Polaris/perception_bringup,OUXT-Polaris/playstation_controller_drivers,OUXT-Polaris/point_painting,OUXT-Polaris/prometheus_ros,OUXT-Polaris/protolink,OUXT-Polaris/quaternion_operation,OUXT-Polaris/robotx_behavior_tree,OUXT-Polaris/robotx_communication,OUXT-Polaris/robotx_costmap_calculator,OUXT-Polaris/robotx_ekf,OUXT-Polaris/scan_segmentation,OUXT-Polaris/sol_vendor,OUXT-Polaris/tcp_sender,OUXT-Polaris/usv_controller,OUXT-Polaris/detic_onnx_ros2)
+@github_dashboard(OUXT-Polaris/color_names,OUXT-Polaris/data_buffer,OUXT-Polaris/detic_onnx_ros2,OUXT-Polaris/geographic_conversion,OUXT-Polaris/geographic_info,OUXT-Polaris/grid_map_type_adapter,OUXT-Polaris/hermite_path_planner,OUXT-Polaris/image_processing_utils,OUXT-Polaris/joy_to_twist,OUXT-Polaris/lua_vendor,OUXT-Polaris/message_synchronizer,OUXT-Polaris/navi_sim,OUXT-Polaris/nmea_hardware_interface,OUXT-Polaris/nmea_to_geopose,OUXT-Polaris/odom_frame_publisher,OUXT-Polaris/ouxt_common,OUXT-Polaris/pcl_apps,OUXT-Polaris/pcl_type_adapter,OUXT-Polaris/perception_bringup,OUXT-Polaris/playstation_controller_drivers,OUXT-Polaris/point_painting,OUXT-Polaris/prometheus_ros,OUXT-Polaris/protolink,OUXT-Polaris/protolink_drivers,OUXT-Polaris/quaternion_operation,OUXT-Polaris/robotx_behavior_tree,OUXT-Polaris/robotx_communication,OUXT-Polaris/robotx_costmap_calculator,OUXT-Polaris/robotx_ekf,OUXT-Polaris/scan_segmentation,OUXT-Polaris/sol_vendor,OUXT-Polaris/tcp_sender,OUXT-Polaris/usv_controller,OUXT-Polaris/detic_onnx_ros2)
diff --git a/firmware/mini_v/motor_driver/lib/protolink_msgs/proto/hardware_communication_msgs__MotorControl.proto b/firmware/mini_v/motor_driver/lib/protolink_msgs/proto/hardware_communication_msgs__MotorControl.proto
index bf404ba81..058756e61 100644
--- a/firmware/mini_v/motor_driver/lib/protolink_msgs/proto/hardware_communication_msgs__MotorControl.proto
+++ b/firmware/mini_v/motor_driver/lib/protolink_msgs/proto/hardware_communication_msgs__MotorControl.proto
@@ -2,6 +2,20 @@ syntax = "proto3";
 package protolink__hardware_communication_msgs__MotorControl;
 
 message hardware_communication_msgs__MotorControl {
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+double motor_speed = 1;
+=======
 bool motor_enable = 1;
 double motor_speed = 2;
+>>>>>>> e6e99620788d4244a48300a042935bab1c4fb7fc
+=======
+bool motor_enable = 1;
+double motor_speed = 2;
+>>>>>>> e6e99620788d4244a48300a042935bab1c4fb7fc
+=======
+bool motor_enable = 1;
+double motor_speed = 2;
+>>>>>>> origin/master
 }
\ No newline at end of file
diff --git a/firmware/mini_v/motor_driver/platformio.ini b/firmware/mini_v/motor_driver/platformio.ini
index c1e53705a..c0ba884f4 100644
--- a/firmware/mini_v/motor_driver/platformio.ini
+++ b/firmware/mini_v/motor_driver/platformio.ini
@@ -26,4 +26,4 @@ board = teensy41
 framework = arduino
 lib_deps = nanopb/Nanopb@^0.4.91
 build_flags =
-  -DLEFT
\ No newline at end of file
+  -DLEFT
diff --git a/robotx_ws_docker.sh b/robotx_ws_docker.sh
old mode 100755
new mode 100644