A merge test.

See if you can merge this!