cmdutils: remove #if 0-ed conflict marger trash that i forgot