Fix bad merge ?