diff --git a/config/freertos/esp32/create.sh b/config/freertos/esp32/create.sh
index 35d4a192..103981bf 100755
--- a/config/freertos/esp32/create.sh
+++ b/config/freertos/esp32/create.sh
@@ -26,11 +26,7 @@ pushd $FW_TARGETDIR >/dev/null
 
         . $IDF_PATH/export.sh
 
-<<<<<<< HEAD
-        pip3 install catkin_pkg lark-parser colcon-common-extensions --break-system-packages
-=======
-        pip3 install catkin_pkg lark-parser empy==3.3.4 colcon-common-extensions
->>>>>>> 6c040e3 (Fix iron (#734))
+        pip3 install catkin_pkg lark-parser empy==3.3.4 colcon-common-extensions --break-system-packages
 
     popd >/dev/null