diff --git a/.github/workflows/test-n-publish.yml b/.github/workflows/test-n-publish.yml
index e633412..a1fe18b 100644
--- a/.github/workflows/test-n-publish.yml
+++ b/.github/workflows/test-n-publish.yml
@@ -22,10 +22,7 @@ jobs:
         python -m pip install "git+https://github.com/RRZE-HPC/OSACA.git@InstrucForm"
         python -m pip install codecov requests sympy
         python -m pip install -e .
-<<<<<<< HEAD
         #iaca_get --I-accept-the-Intel-What-If-Pre-Release-License-Agreement-and-please-take-my-soul
-=======
->>>>>>> master
     - name: Test
       run: |
         coverage run -p tests/all_tests.py