diff --git a/.github/workflows/diff.yaml b/.github/workflows/diff.yaml
index 021585e..bbf34c2 100644
--- a/.github/workflows/diff.yaml
+++ b/.github/workflows/diff.yaml
@@ -13,4 +13,8 @@ jobs:
         uses: pedjak/crossplane-diff-action@action
         with:
           dir: examples
+<<<<<<< HEAD
           github-token: ${{ secrets.GITHUB_TOKEN }}
+=======
+          token: ${{ secrets.GITHUB_TOKEN }}
+>>>>>>> 4432273 (wip)