changes to workout summary
merge conflict resolution