Fix conflicts

.github/workflows/deploy.yml

@@ -27,16 +27,11 @@ jobs:
     - name: Install Python dependencies
       shell: bash
       run: |
-<<<<<<< HEAD
-        python -m pip install --upgrade pip
-        pip install --upgrade --requirement requirements.txt
-=======
         sudo apt-get update -y
         sudo apt-get install -y python3-pip python3-venv
         python3 -m venv .venv
         source .venv/bin/activate
         pip3 install --upgrade --requirement requirements.txt
->>>>>>> 1709ece (Use venv in CI (#916))
 
     - name: Install doxygen and graphviz
       run: sudo apt-get install -y doxygen graphviz
@@ -46,16 +41,12 @@ jobs:
         ruby-version: '3'
 
     - name: Run htmlproofer.sh
-<<<<<<< HEAD
-      run: ./htmlproofer.sh
-=======
       shell: bash
       run: |
         source /opt/ros/rolling/setup.bash
         source /root/ws_moveit/install/setup.bash
         source .venv/bin/activate
         ./htmlproofer.sh
->>>>>>> 1709ece (Use venv in CI (#916))
 
   upload_site_artifacts:
     strategy: