ConflictResolution conflictResolution = new ConflictResolution(); ConflictResolution[] conflictResolutions = { conflictResolution };
IMarkerResolution[] conflictResolutions = {new EditConflictsResolution(), new AcceptMineResolution(), new AcceptTheirsResolution(), new MarkAsResolvedResolution()};
    public IMarkerResolution[] getResolutions(IMarker marker) {        ConflictResolution conflictResolution = new ConflictResolution();        ConflictResolution[] conflictResolutions = { conflictResolution };        return conflictResolutions;    }