diff --git a/src/main/java/org/springframework/samples/petclinic/UserService.java b/src/main/java/org/springframework/samples/petclinic/UserService.java
index fc1cf6a57..1b1fcac5a 100644
--- a/src/main/java/org/springframework/samples/petclinic/UserService.java
+++ b/src/main/java/org/springframework/samples/petclinic/UserService.java
@@ -1,6 +1,6 @@
 public class UserService {
     public String getUserName(int userId) {
-        return "Main: User_" + userId;
+        return "User_" + userId;
     }
 
     public boolean isUserActive(int userId) {
@@ -23,4 +23,4 @@ public class UserService {
     private void logDeletion(int userId) {
         System.out.println("Main: user " + userId + " deleted");
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java
index e2955a680..981c47851 100644
--- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java
+++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java
@@ -4,8 +4,8 @@ public class HelloWorld {
     }
 
     public static void helloWorld() {
-		System.out.println("Hello, World! main");
-		System.out.println("Hello, World! main");
-		System.out.println("Hello, World! main");
+        System.out.println("Hello, World! main");
+        System.out.println("Hello, World! main");
+        System.out.println("Hello, World! main");
     }
-}
+}
\ No newline at end of file