diff --git a/backend/handlers/auth/local_auth.go b/backend/handlers/auth/local_auth.go
index cea93b3..73240a3 100644
--- a/backend/handlers/auth/local_auth.go
+++ b/backend/handlers/auth/local_auth.go
@@ -85,12 +85,8 @@ func LocalLoginHandler(provider authprovider.AuthProvider) gin.HandlerFunc {
 			c.JSON(http.StatusInternalServerError, gin.H{"error": "Erreur lors de la génération du token"})
 			return
 		}
-
-<<<<<<< Updated upstream
 		monitoring.UserLoginsTotal.WithLabelValues("success").Inc()
-=======
 		monitoring.RecordUserLogin(true)
->>>>>>> Stashed changes
 		c.JSON(http.StatusOK, sessionResponse(token, au.ID, au.Email))
 	}
 }
diff --git a/backend/handlers/auth/register.go b/backend/handlers/auth/register.go
index 53b4a8d..411bfc6 100644
--- a/backend/handlers/auth/register.go
+++ b/backend/handlers/auth/register.go
@@ -117,11 +117,7 @@ func RegisterHandler(c *gin.Context, db *bun.DB, provider authprovider.AuthProvi
 		return
 	}
 
-<<<<<<< Updated upstream
 	monitoring.UserRegistrationsTotal.Inc()
-=======
-	monitoring.RecordUserRegistration()
->>>>>>> Stashed changes
 	mailer.SendWelcome(req.Email, req.Name)
 	c.JSON(http.StatusCreated, gin.H{"message": "Profil créé avec succès"})
 }