Fix bad merge again.