Fix bad merge from master