deleted old todo file and unused merge notes