diff --git a/DEBIAN/control b/DEBIAN/control
index cef5486..0bc14c7 100644
--- a/DEBIAN/control
+++ b/DEBIAN/control
@@ -4,11 +4,7 @@ Section: utils
 Priority: optional
 Architecture: all
 Depends: python3, python3-pip
-<<<<<<< HEAD
-Maintainer: Alex Rennie-Lis <a.lis@cornwall-insight.com>
-=======
 Maintainer: Alex Rennie-Lis <alex@unblue.co.uk>
->>>>>>> 9575ae6 (New base)
 Description: A webhook service that executes shell scripts on incoming requests
  A simple webhook service configured via systemd and /etc/webhookd.conf.