I deleted do_nothing.cpp from the merge