Huh, merge stuff.
Merge resolution?