index.html

<!doctype html>
<html>
  <head>
    <title>Making change by master.  This is the title of the webpage -- automerge</title>
  </head>
  <body>
<<<<<<< HEAD
    <p>Convert to Xin's page, be patience!  Anything in the <strong>body</strong> tag will appear on the page, just like this <strong>p</strong> tag and its contents.</p>
=======
    <p>Change by branch.  Convert to Xin's page, be patience!  Anything in the <strong>body</strong> tag will appear on the page, just like this <strong>p</strong> tag and its contents.</p>
>>>>>>> realwork
  </body>
</html>