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