i untrack everything
recommit everything after diverged