Merge branch 'master' into update_image

.github/workflows/label_merge_conflicts.yml

@@ -0,0 +1,15 @@
+name: 'Check for merge conflicts'
+
+on: [push]
+
+jobs:
+  find_conflicts:
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: mschilde/auto-label-merge-conflicts@master
+        with:
+          CONFLICT_LABEL_NAME: "has conflicts"
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MAX_RETRIES: 5
+          WAIT_MS: 5000