diff --git a/.github/workflows/linting.yaml b/.github/workflows/linting.yaml
index b5836e6..b38cd1b 100644
--- a/.github/workflows/linting.yaml
+++ b/.github/workflows/linting.yaml
@@ -1,13 +1,7 @@
 name: Linting
 
-<<<<<<< HEAD
 on: [workflow_call]
     
-=======
-on:
-  workflow_call
-
->>>>>>> bfb9069fff47a4d4f7597e3f0d72a8bc09c4e07d
 jobs:
   lint:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml
index 44c7e3a..9673b6d 100644
--- a/.github/workflows/pull_request.yaml
+++ b/.github/workflows/pull_request.yaml
@@ -1,13 +1,12 @@
 name: PR CICD
-on:
+on: [workflow_dispatch]
   pull_request:
     branches:
       - master
     types:
       - opened
       - edited
-  workflow_dispatch
-
+  
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/testing.yaml b/.github/workflows/testing.yaml
index 12823b5..e99f7e6 100644
--- a/.github/workflows/testing.yaml
+++ b/.github/workflows/testing.yaml
@@ -1,20 +1,10 @@
 name: Testing
 
-<<<<<<< HEAD
 on: [workflow_call]
-jobs:
-  test:
-    runs-on: ubuntu-latests
-=======
-on:
-  workflow_call
 
 jobs:
   test:
-    runs-on: ubuntu-latest
-    defaults:
-      continue-on-error: True
->>>>>>> bfb9069fff47a4d4f7597e3f0d72a8bc09c4e07d
+    runs-on: ubuntu-latests
     steps:
       - uses: actions/setup-python@v2
         with: