public ConflictState getConflictState() {return conflictState;}

public ConflictState getConflictState ( ) { return conflictState ; }
public virtual MergeChunk.ConflictState GetConflictState(){return conflictState;}
