Add Adam's name to the assignment (to cause a merge conflict)
fixed merge conflict