Resolving merge conflicts

.github/workflows/gh-pages.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - release/*
 
 jobs:
   generate:
@@ -64,6 +65,7 @@ jobs:
       # Docs: https://github.com/peaceiris/actions-gh-pages#%EF%B8%8F-docusaurus
       - name: Deploy to GitHub Pages
         uses: peaceiris/actions-gh-pages@v3
+        if: startsWith(github.ref, 'refs/heads/main')
         with:
           github_token: ${{ secrets.DEPLOY_TOKEN }}
           publish_dir: ./website/build

.github/workflows/windows10_build.yml

@@ -66,6 +66,9 @@ jobs:
           Set-ItemProperty 'HKLM:\System\CurrentControlSet\Control\FileSystem' -Name 'LongPathsEnabled' -value 1
           git config --system core.longpaths true
 
+      - name: Checkout
+        uses: actions/checkout@v2.4.2
+
       - name: Download Artifact
         uses: actions/download-artifact@v2
         with:
@@ -98,4 +101,3 @@ jobs:
           Remove-Item '.\build\nsis\OpenBB Terminal Setup.exe' -Recurse
           Remove-Item .\build\nsis\app\ -Recurse
           Remove-Item .\dist\ -Recurse
-