Fixed merging errors in main.cpp