Fix bad merge 2