Merge fixing more errros into develop

docs/guides/openshock-first-setup.md

@@ -30,16 +30,12 @@
     3. Press the green button next to it and type in your Wi-Fi password, then press submit.
     *A green pop up should appear if it's connected successfully*
     ??? Info "Images (click to expand)"
-<<<<<<< HEAD
-        ![Image "image"](../static/guides/first-setup/ESPWebGUI.png)  
-=======
         ![Image "image"](../static/guides/first-setup/ESPWebGUI.png)
 
 !!! warning "RF TX Pin" 
     **DO NOT** change the RF TX Pin **UNLESS IT IS NOT AUTOMATICALLY DETECTED**.  
     This is an advanced feature. It should be set correctly by default after flashing the OpenShock firmware. If the pin is not automatically selected, you can open a UART terminal and send the command `rftxpin #` where `#` is your pin number. If you do not know how to do this, you can also reflash the board and configure the pin in the web interface. For more information see the page dedicated to your micro-controller under [boards](../hardware/boards/index.md).
 
->>>>>>> origin/Fixing-more-errors
 3. Create a hub on the website:
     1. **On your PC** open [openshock.app](https://openshock.app/).
     2. Create an account. *(If you don't have one already)*