Add my file in my local branch
Merge branch 'master' into dev
Update the problem of no activity