Add Issue1
Add Issue2
Issue1 Add Comment
Merge remote-tracking branch 'origin/issue1'

Conflicts:
	testA.txt