diff --git a/.github/reviewer-lottery.yml b/.github/reviewer-lottery.yml
index fbe75e955d..c6580eacd4 100644
--- a/.github/reviewer-lottery.yml
+++ b/.github/reviewer-lottery.yml
@@ -15,25 +15,6 @@ groups:
     usernames:
       - aprotyas
       - arne48
-<<<<<<< HEAD
-      - DasRoteSkelett
-      - Serafadam
-      - harderthan
-      - jaron-l
-      - malapatiravi
-      - homalozoa
-      - erickisos
-      - anfemosa
-      - jackcenter
-      - VX792
-      - mhubii
-      - livanov93
-      - aprotyas
-      - peterdavidfagan
-      - duringhof
-      - bijoua29
-      - lm2292
-=======
       - bijoua29
       - christophfroehlich
       - DasRoteSkelett
@@ -42,7 +23,6 @@ groups:
       - fmauch
       - jaron-l
       - livanov93
->>>>>>> 0a96cbb (Update list of reviewers (#884))
       - mcbed
       - moriarty
       - olivier-stasse