Final merge resolution.