merge conflict
Add users on front page for each task