Incorrect merge fixes.