Changing report layout
Resolving conflicts on cohort report