a test 2 file was created
random message added
Merge remote-tracking branch 'origin/test_b'

Conflicts:
	Test1.txt
Merge file