fix merge fail . . .