diff --git a/doc/Extensions/Applications.md b/doc/Extensions/Applications.md
index 3a5b100b30..326af2c46a 100644
--- a/doc/Extensions/Applications.md
+++ b/doc/Extensions/Applications.md
@@ -170,7 +170,6 @@ extend memcached /usr/local/bin/memcached
 4. Restart snmpd on your host
 5. On the device page in Librenms, edit your host and check `Memcached` under the Applications tab.
 
-<<<<<<< HEAD
 ### Unbound
 
 ##### Agent