diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 676de10..72165c4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -36,12 +36,9 @@ jobs:
       - name: Build
         id: build
         run: ./.ci-build-without-test.sh
-<<<<<<< Updated upstream
-=======
       - name: Spotless Check
         if: matrix.jdk == 11 || matrix.jdk == 17
         run: ./gradlew spotlessCheck
->>>>>>> Stashed changes
       - name: PICO Typecheck Test
         if: ${{ steps.build.outcome == 'success' }}
         run: ./gradlew ImmutabilityTypecheckTest