Changed after line 5
Merge remote-tracking branch 'origin/master'

Conflicts:
	bar.foo.txt
gitattributes edited
merging