Add foo
Add foo
Update foo
Update foo
[#27855649] Update foo
[finish #27855649] Merge branch 'foobar' into master

Conflicts:
	foo