Made some changes to my page2.htm in some of the same places that Mark did to test out merging / conflicts