ci: update workflow trigger conditions

Author: mrpollo

.github/workflows/check_board_conflicts.yaml

@@ -5,10 +5,9 @@ on:
     branches:
       - 'main'
       - 'master'
-    pull_request:
-      branches:
-        - '*'
-
+  pull_request:
+    branches:
+      - '*'
 jobs:
   check:
     name: Check for Conflicts

.github/workflows/main.yaml

@@ -3,10 +3,11 @@ name: Build and Deploy
 on:
   push:
     branches:
-    - 'master'
+      - 'main'
+      - 'master'
   pull_request:
     branches:
-    - '*'
+      - '*'
 
 
 jobs: