Test Commit #3
Created test 1 branch.txt
Merge branch 'origin/test2'

Conflicts:
	Test.txt (resolved)
Merge branch 'origin/test'