diff --git a/server/uptime-kuma-server.js b/server/uptime-kuma-server.js
index 2924a0665..38a7d9831 100644
--- a/server/uptime-kuma-server.js
+++ b/server/uptime-kuma-server.js
@@ -124,11 +124,8 @@ class UptimeKumaServer {
         UptimeKumaServer.monitorTypeList["port"] = new TCPMonitorType();
         UptimeKumaServer.monitorTypeList["manual"] = new ManualMonitorType();
         UptimeKumaServer.monitorTypeList["redis"] = new RedisMonitorType();
-<<<<<<< HEAD
         UptimeKumaServer.monitorTypeList["system-service"] = new SystemServiceMonitorType();
-=======
         UptimeKumaServer.monitorTypeList["sqlserver"] = new MssqlMonitorType();
->>>>>>> upstream/master
 
         // Allow all CORS origins (polling) in development
         let cors = undefined;