diff --git a/.github/workflows/create-block.yml b/.github/workflows/create-block.yml
index 654a8427d17b2..8fa3d4aca0eee 100644
--- a/.github/workflows/create-block.yml
+++ b/.github/workflows/create-block.yml
@@ -27,7 +27,7 @@ jobs:
             - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
 
             - name: Use desired version of NodeJS
-              uses: actions/setup-node@v3 # v3.6.0
+              uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
               with:
                   node-version: ${{ matrix.node }}
                   cache: npm
diff --git a/packages/e2e-tests/CHANGELOG.md b/packages/e2e-tests/CHANGELOG.md
index 5dcf23abf131c..4e95e0b5a814a 100644
--- a/packages/e2e-tests/CHANGELOG.md
+++ b/packages/e2e-tests/CHANGELOG.md
@@ -2,15 +2,10 @@
 
 ## Unreleased
 
-<<<<<<< Updated upstream
 ### Breaking Changes
 
 -  Started requiring Jest v29 instead of v27 as a peer dependency. See [breaking changes in Jest 28](https://jestjs.io/blog/2022/04/25/jest-28) and [in jest 29](https://jestjs.io/blog/2022/08/25/jest-29) ([#47388](https://github.com/WordPress/gutenberg/pull/47388))
-=======
-### Breaking Change
-
 -   Increase the minimum Node.js version to 18 ([#48950](https://github.com/WordPress/gutenberg/pull/48950)).
->>>>>>> Stashed changes
 
 ## 6.5.0 (2023-03-01)