Fix unnoticed blunder on resolving conflicts for main.cpp breaking the build. Please check if everyone's code is included.