Fixing bad merge resolution.