Remove the conflict main.cpp