package yellow_egg;

public class HelloWorld {

	public static void main(String[] args) {
		// TODO Auto-generated method stub
		System.out.println("Hello World");
		System.out.println("Hello egg");
	}

}

@@ -42,16 +42,87 @@
 World %7B%0D
+%0A%09public HelloWorld() %7B%0D%0A%09%09// TODO Auto-generated constructor stub%0D%0A%09%7D%0D
 %0A%0D%0A%09publ
@@ -233,17 +233,83 @@
 World%22);
-%0D
+%0A%09%09System.out.println(%22wwwwwww%22);%0D%0A%09%09System.out.println(%22yyyyyyy%22);
 %0A%09%09Syste
@@ -335,17 +335,16 @@
 o egg%22);
-%0D
 %0A%09%7D%0D%0A%0D%0A%7D

fix conflic