Committing Branch1 Changes To Branch1
Merging Committed Branch1 Changes To Master

Conflicts:
	Test.txt