SHA1
--- a/1.html
+++ b/1.html
@@ -1 +1,5 @@
 
				-Welcome home <3
			
 
				+<<<<<<< HEAD
			
 
				+Does she love me?
			
 
				+=======
			
 
				+Welcome home <3
			
 
				+>>>>>>> master
			
--- a/3.html
+++ b/3.html
@@ -0,0 +1 @@
 
				+25аыф2
			
--- a/4.txt
+++ b/4.txt
@@ -1 +1,5 @@
 
				-fs
			
 
				+<<<<<<< HEAD
			
 
				+5623474
			
 
				+=======
			
 
				+fs
			
 
				+>>>>>>> master
			
--- a/5.txt
+++ b/5.txt
Author	SHA1 Message	Date
John Doe	c9731a87b5 New	4 years ago
John Doe	63c375ab09 New file and add text	4 years ago
John Doe	55549de0a8 add text	4 years ago