diff --git a/PKGBUILD b/PKGBUILD
index b72fe2e..eb4fbb0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 # Maintainer: RealStickman <mrc+aur@frm01.net>
+=======
+# Maintainer: exu <aur _a_ frm01 _d_ net>
+>>>>>>> 4663b23 (Update maintainer name and email)
 
 pkgname=kopia-ui-bin
 pkgdesc='A cross-platform backup-tool with encryption, deduplication, compression and cloud support.'