diff --git a/Readme.md b/Readme.md
index b782f95..509f88e 100644
--- a/Readme.md
+++ b/Readme.md
@@ -51,11 +51,7 @@ This can be done on a privileged Debian CT (make sure to enable the Fuse, Nestin
 | heimdall | Alpine | Heimdall, A application dashboard/launcher  | 
 | vouchproxy | Alpine | Vouch-proxy, A SSO solution for Nginx  | 
 | freshrss | Alpine | FreshRSS, a self-hosted RSS feed aggregator  | 
-<<<<<<< HEAD
 | uptiimekuma | Alpine | Uptime Kuma a self-hosted monitoring tool.  | 
-=======
-| uptimekuma | Alpine | Uptime Kuma a self-hosted monitoring tool.  | 
->>>>>>> 43bdf4c (Added CT: Uptime Kuma, Fixed sudo issue whiile building)
 
 ## TODO
 **Begin original list**