Fixed merge failure.