first commit from lager
more refined output for probis
merge confliction