diff --git a/.github/workflows/lint-server.yml b/.github/workflows/lint-server.yml
index 4ffc48a12..aaf522ff6 100644
--- a/.github/workflows/lint-server.yml
+++ b/.github/workflows/lint-server.yml
@@ -7,6 +7,12 @@ on:
     branches: [ main, release-** ]
   workflow_dispatch:
 
+<<<<<<< Updated upstream
+=======
+env:
+ BRANCH_NAME: ${{ github.head_ref || github.ref_name }} 
+ 
+>>>>>>> Stashed changes
 jobs:
   golangci:
     name: plugin
@@ -16,6 +22,24 @@ jobs:
         with:
           go-version: 1.18.1
       - uses: actions/checkout@v3
+<<<<<<< Updated upstream
+=======
+        with:
+          path: "focalboard"
+      - id: "mattermostServer"
+        uses: actions/checkout@v3
+        continue-on-error: true
+        with:
+          repository: "mattermost/mattermost-server"
+          path: "mattermost-server"
+          ref: ${{ env.BRANCH_NAME }}
+      - uses: actions/checkout@v3
+        if: steps.mattermostServer.outcome == 'failure'
+        with:
+          repository: "mattermost/mattermost-server"
+          path: "mattermost-server"
+          ref : "master"
+>>>>>>> Stashed changes
       - name: set up golangci-lint
         run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.46.2
       - name: lint