Add 'Merge Articles' text the grader looks for.
Only show merge if the current user is an admin.
Merge branch 'hw2'