Fix main.cpp by rebasing again