changed develop_3

src/main/java/Lab1/demo/DemoApplication.java

@@ -8,7 +8,7 @@ public class DemoApplication {
 
 	public static void main(String[] args) {
 		System.out.println("Start application");
-		System.out.println("Conflit");
+		System.out.println("Conflit develop_3 branch");
 			SpringApplication.run(DemoApplication.class, args);
 	}