diff --git a/device/testing/device-essential-mata/APKBUILD b/device/testing/device-essential-mata/APKBUILD
index 8a01a6161f11543cd39dd33e84232e0d2220ee7e..9921a0d875a6859e13f03067c775f31f111d097b 100644
--- a/device/testing/device-essential-mata/APKBUILD
+++ b/device/testing/device-essential-mata/APKBUILD
@@ -1,7 +1,11 @@
 # Contributor: Avery Dorgan <avery.dorgan@protonmail.com>
 # Maintainer: Avery Dorgan <avery.dorgan@protonmail.com>
 # Reference: <https://postmarketos.org/devicepkg>
+<<<<<<< HEAD
 pkgname=device-essential-mata
+=======
+pkgname="device-essential-mata"
+>>>>>>> Upload New File
 pkgdesc="Essential PH1"
 pkgver=0.1
 pkgrel=0