Minor change
Fix conflict
Add user activities running total to show page
Fix conflict