Fix bad merge in main.cc