diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml
index 4d27c088..62f299d2 100644
--- a/.github/workflows/cooker.yml
+++ b/.github/workflows/cooker.yml
@@ -6,17 +6,11 @@ name: Cooker
 on:
   # Triggers the workflow on push or pull request events but only for the main branch
   push:
-<<<<<<< HEAD
     branches:
      - cooker
   pull_request: 
     branches:
      - cooker
-=======
-    branches: [ '*' ]
-  pull_request: 
-    branches: [ '*' ]
->>>>>>> main
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -35,7 +29,6 @@ jobs:
 
       - name: Prepearing enviornment
         run: |
-<<<<<<< HEAD
           git submodule init
           git submodule update
           sudo add-apt-repository ppa:alexlarsson/flatpak
@@ -43,11 +36,6 @@ jobs:
           sudo apt install flatpak flatpak-builder p7zip-full
           sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
           sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08
-=======
-          sudo apt install flatpak flatpak-builder
-          sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-          sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08
->>>>>>> main
       
       # Runs a set of commands using the runners shell
       - name: Building flatpak
@@ -56,7 +44,6 @@ jobs:
           sudo flatpak-builder --repo=local --force-clean localrepo com.xargon.retrodeck.yml
           sudo flatpak build-bundle local RetroDECK.flatpak com.xargon.retrodeck
 
-<<<<<<< HEAD
       - name: Get date for artifacts
         id: date
         run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M')"
@@ -65,31 +52,12 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           tag: "${{ steps.date.outputs.date }}"
-=======
-      - name: Publish the flatpak in a new cooker release
-        uses: ncipollo/release-action@v1
-        with:
-          tag: "${{ steps.version.outputs.version }}"
->>>>>>> main
           body: |
             # Release Notes (Cooker)
             This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}.
     
-<<<<<<< HEAD
             Cooker channel is provided for the community to test fixes and explore new functionality.
             Please DO NOT open issues or ask support on this build.
-=======
-            Cooker channel is provided for the community to test fixes and explore new functionality.  Please DO NOT open issues on this build and instead post in the `#pre-release-feedback` section of discord.
-            
-            See the [wiki](https://amberelec.org/Contributing-to-AmberELEC) for more info.
-            
-            ### Changes (since last prerelease version):
-            ${{ github.event.client_payload.release_notes }}
-            
-            ### Upgrade Instructions
-            You can update to this release using the `prerelease` channel on your device. This is the recommended way to use prerelease versions.
-
->>>>>>> main
 
           artifacts: "RetroDECK.flatpak"
           allowUpdates: true
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fbac637f..605c0ae4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,9 +6,11 @@ name: main
 on:
   # Triggers the workflow on push or pull request events but only for the main branch
   push:
-    branches: [ main ]
+    branches: 
+      - main
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch: