added quiz attempts in activity feed
conflict resolved