merge main.cpp