diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2ca470c..1bdd543 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,8 +17,4 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Build Docker image
-<<<<<<< HEAD
       run: docker build -t discord-badge .
-=======
-      run: docker build -t discord-badge .
->>>>>>> dev