fix merge conflict

Author: vleong99

server/server.go

@@ -46,13 +46,8 @@ func (s *Server) routes() {
 	s.mux.Handle("GET /api/quality", handlers.HandleGetQuality())
 	s.mux.Handle("GET /api/rank", handlers.HandleGetRank(s.checks.Rank))
 	s.mux.Handle("GET /api/redirects", handlers.HandleGetRedirects())
-<<<<<<< HEAD
-	s.mux.Handle("GET /api/social-tags", handlers.HandleGetSocialTags())
-	s.mux.Handle("GET /api/tls", handlers.HandleTLS(s.checks.Tls))
-=======
 	s.mux.Handle("GET /api/social-tags", handlers.HandleGetSocialTags(s.checks.SocialTags))
-	s.mux.Handle("GET /api/tls", handlers.HandleTLS())
->>>>>>> upstream/main
+	s.mux.Handle("GET /api/tls", handlers.HandleTLS(s.checks.Tls))
 	s.mux.Handle("GET /api/trace-route", handlers.HandleTraceRoute())
 }