Fix conflicts

Author: Carlosespicur

.github/workflows/reusable-ci.yml

@@ -40,22 +40,13 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v6
         with:
-<<<<<<< HEAD
-          python-version: "3.10"
-=======
           python-version: ${{ inputs.python-version }}
->>>>>>> 5da3e80 (Fix nightly and add PR template (#36))
 
       - name: Install required python packages
         uses: ./.github/actions/install_python_packages
         with:
-<<<<<<< HEAD
           packages: "catkin_pkg lark-parser empy==3.3.4 colcon-common-extensions"
-          python-version: "3.10"
-=======
-          packages: "catkin_pkg lark-parser empy colcon-common-extensions"
           python-version: ${{ inputs.python-version }}
->>>>>>> 5da3e80 (Fix nightly and add PR template (#36))
           use-sudo: "true"
 
       - name: Install TivaWare SDK