diff --git a/PKGBUILD b/PKGBUILD
index 6284789..9f7dbab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # Maintainer: RealStickman <mrc+aur _a_ frm01 _d_ net>
+=======
+# Maintainer: exu <aur _a_ frm01 _d_ net>
+>>>>>>> cda177a (Update maintainer name and email)
 
 pkgname=streamrip
 pkgver=2.0.5