modified:   abc.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	abc.txt

 Changes to be committed:

	modified:   abc.txt