1) Changed the h1 to test for a merge conflict