Merge branch 'firstBranch'
Testing Merge features
Merge branch 'firstBranch'

Conflicts:
	branch_doc.txt
Third Edit