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 4a18a0f43..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! 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