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 514646af9..78d408120 100644
--- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java
+++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java
@@ -5,8 +5,8 @@ public class HelloWorld {
 
     public static void helloWorld() {
         System.out.println("Hello, World!");
-		 System.out.println("Hello, World! dev..");
-		 System.out.println("Hello, World! dev....");
-		 System.out.println("Hello, World!dev ....");
+        System.out.println("Hello, World! main");
+        System.out.println("Hello, World! main.....");
+        System.out.println("Hello, World! main.......");
     }
-}
+}
\ No newline at end of file