Update main.cpp

merge