Working on user and activity relation
Resolving merge issues