Merge Conflict (Pt 1 of 2)

Editing on GitHub website, attempting to create a merge conflict.