Show what we're merging.

Helps folk figure out conflicts.