diff --git a/.github/workflows/save-pr-data-to-file.yml b/.github/workflows/save-pr-data-to-file.yml
index 334d7cd828..b35e89956a 100644
--- a/.github/workflows/save-pr-data-to-file.yml
+++ b/.github/workflows/save-pr-data-to-file.yml
@@ -11,11 +11,7 @@ jobs:
   save-pr-data:
     name: Save PR data to file
     runs-on: ubuntu-latest
-<<<<<<< HEAD
     if: ${{ github.event.pull_request.user.login != 'github-actions[bot]' }}
-=======
-    if: ${{ (github.event.pull_request.base.repo.full_name != 'openscd/open-scd') && github.event.pull_request.user.login != 'github-actions[bot]' }}
->>>>>>> open-scd-core/main
     steps:
       - name: Save PR node_id and event_action to files
         if: github.event_name == 'pull_request' || github.event_name == 'pull_request_target'
@@ -38,4 +34,4 @@ jobs:
           name: REVIEW_DATA
           path: |
             PR_NODE_ID.txt
-            REVIEW_STATE.txt
+            REVIEW_STATE.txt
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 677f2ac4c8..38a39ceb66 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,19 +1,14 @@
 name: Test
-<<<<<<< HEAD
 on:
   push:
     branches-ignore:
       - main
-=======
-on: push
->>>>>>> open-scd-core/main
 
 jobs:
   test:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-<<<<<<< HEAD
         uses: actions/checkout@v2.3.1
 
       - name: Use Node.js 18.x
@@ -25,21 +20,4 @@ jobs:
         run: |
           cd packages/open-scd
           npm clean-install
-          npm run-script test
-=======
-        uses: actions/checkout@v3
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Install playwright browsers
-        run: npx playwright install --with-deps
-
-      - name: Run tests
-        run: npm run-script test
->>>>>>> open-scd-core/main
+          npm run-script test
\ No newline at end of file