package yellow_egg;

public class HelloWorld {
	public HelloWorld() {
		// TODO Auto-generated constructor stub
	}

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

}

@@ -197,16 +197,17 @@
 d stub%0D%0A
+%0A
 %09%09System
@@ -337,16 +337,17 @@
  egg%22);%0A
+%0A
 %09%7D%0D%0A%0D%0A%7D%0D

fix conflict