diff --git a/pkglist.txt b/pkglist.txt
index efa3bd5..631dc74 100644
--- a/pkglist.txt
+++ b/pkglist.txt
@@ -44,9 +44,7 @@ ttf-ubuntu-font-family
 xdg-user-dirs
 xdg-desktop-portal
 xorg-server
-<<<<<<< HEAD
 xorg
-=======
 xorg-xrandr
 xorg-xkill
 xorg-xmessage
@@ -57,18 +55,11 @@ xorg-xsetroot
 xf86-video-qxl
 xf86-video-intel
 xf86-video-amdgpu
->>>>>>> 609e97154f55e730e4e1825daf67bf9b3cfb11ce
 xterm
 vim
 dunst
 xdotool
 qtile
-<<<<<<< HEAD
-=======
 volumeicon
-<<<<<<< Updated upstream
->>>>>>> 609e97154f55e730e4e1825daf67bf9b3cfb11ce
-=======
 mesa
 lib32-mesa
->>>>>>> Stashed changes