diff --git a/aur/owncloud/PKGBUILD b/aur/owncloud/PKGBUILD
index 688d79b3f..0ce48682c 100644
--- a/aur/owncloud/PKGBUILD
+++ b/aur/owncloud/PKGBUILD
@@ -1,11 +1,7 @@
 # Maintainer: Antonio Rojas <nqn1976 @ gmail.com>
 # Based on owncloud-git PKGBUILD by Alexander Ovsyannikov
 
-<<<<<<< HEAD
 # ALARM Maintainer: Tommaso Sardelli <lacapannadelloziotom@gmail.com
-=======
-# ALARM Maintainer: Tommaso Sardelli <lacapannadelloziotom@gmail.com>
->>>>>>> upstream/master
 
 pkgname=owncloud
 pkgver=4.5.7