trying to merge
fixed merge screwup :zap:
Merge branch 'master' into user-activity
updates to the activities show page