[FIX][runbot] Fix bad merge