public class A {

<<<<<<< A.java
public B ddsdfsdffadfs;
=======
public B dbbkk;
>>>>>>> 1.6
 
  public C d:

}