7 年之前 · 317701075e
--- a/new1.txt
+++ b/new1.txt
@@ -7,6 +7,10 @@
 
				    	 <h3>3333</h3>
			
 
				 	<h4>this is a new h4</h4>
			
 
				     hello,world!
			
 
				+<<<<<<< HEAD
			
 
				     hello,world3!
			
 
				+=======
			
 
				+    hello,world2!
			
 
				+>>>>>>> 4d19183135fb90e5a8e89a3bf66207d18b9e3d1d
			
 
				 </body>
			
 
				 </html>