User activity - fixed merge conflicts

:zap: