diff --git a/kwin/Pkgfile b/kwin/Pkgfile
index bd10048..79edf62 100644
--- a/kwin/Pkgfile
+++ b/kwin/Pkgfile
@@ -4,8 +4,13 @@
 # Depends on: kdeclarative kdecoration kglobalacceld knewstuff kscreenlocker kwayland lcms2 libdisplay-info libinput pipewire qt6-multimedia qt6-sensors xorg-xwayland
 
 name=kwin
+<<<<<<< HEAD
 version=6.0.4
 release=1
+=======
+version=6.0.3.1
+release=2
+>>>>>>> 29eeaba (Fix screen recording when pipewire is started after kwin (#1))
 source=(https://download.kde.org/stable/plasma/${version::5}/$name-$version.tar.xz
         fix-screencast-pipewire.patch)