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