fixed merge conflict by retaining users/cohort_select and removing /random
removed uneccessary partial