Getting rid of merge errors on main.cc