deleted two characters
Merge remote-tracking branch 'origin/master'

Conflicts:
	hello.foo
file merged
Merge remote-tracking branch 'origin/master'