added another line
Merge remote branch 'origin2/master'

Conflicts:
	mercury.txt