# Conflicts: # backend/src/main/java/ovh/herisson/Clyde/Services/AuthenticatorService.java # backend/src/main/java/ovh/herisson/Clyde/Services/UserService.java
# Conflicts: # backend/src/main/java/ovh/herisson/Clyde/Services/AuthenticatorService.java # backend/src/main/java/ovh/herisson/Clyde/Services/UserService.java