# Conflicts: # new.txt
@@ -1,6 +1,7 @@
<body>
<html>
<p >hello world <p>
+ <h2> this is a new world!</h2>
<h1> this is a new world! ok I know it</h1>
</html>
</body>
