recovering from branching cock-up shitstorm waste of time