public class Actor{
	
	private String id;
	private String name;
	
	public Actor(){
		
	}
	
	public void PrintActor(){
		System.out.println("fewfwe");
	}
}
@@ -91,17 +91,16 @@
 %09%0D%0A%09%7D%0D%0A%09
-%0D
 %0A%09public
@@ -155,11 +155,75 @@
 e%22);%0D%0A%09%7D
+%0A%09public void pActor()%7B%0D%0A%09%09System.out.println(%22hello actor%22);%0A%09%7D
 %0D%0A%7D

fix conflict