Update 1.txt
Update 2.txt
add line5
fix Conflicts:
	2.txt
no message
Revert "no message"

This reverts commit 58c04f184a8c3632e3cdda271c52ce61a41fab54.
Revert "Revert "no message""

This reverts commit b2185681b12a5760f15ec9e384ed015cd89caf30.