cool and groovy changes to newfile. There are quite genuine, too.
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	newfile