[S] Change in osmo-ci[master]: obs: don't pass conflict_version through functions