Test

Test
Testing merging local branch with main branch
Merge branch 'localBranch'

Conflicts:
	TestInputCommit - masterBranch.rtf