System.out.println(a.toString()); System.out.println(b.toString());
System.out.println(a.getContent().toString()); System.out.println(b.getContent().toString());
  private XMLNode mergeNodeContent( BranchNode a, BranchNode b ) {/*    // First check if either is null    if( a == null )      return b.getContent();    else if ( b == null )      return a.getContent();*/    boolean aUpdated = !matches( a, a.getBaseMatch() ),            bUpdated = !matches( b, b.getBaseMatch() );    if( aUpdated && bUpdated ) {      if( matches( a, b ) ) {        System.out.println("CONFLICTW; Node updated in both branches, but updates are equal");        return a.getContent();      } else {        //        // CONFLICTCODE here        // if XMLElementNode try merging attributes if XMLTextnode give up        System.out.println("CONFLICT; Node updated in both branches, picking first one:");        System.out.println(a.toString());        System.out.println(b.toString());        return a.getContent();      }    } else if ( bUpdated )      return b.getContent();    else      return a.getContent(); // A modified, or none modified, a is ok in both cases  }