committing our stashed changes
added a small change to test.txt
fixed merge conflicts in test.txt
Merge remote-tracking branch 'origin2/master'

Conflicts:
	test.txt