block descent
resolve merge conflict
block descent for OD