Fix bad untracked (and probably hide conflicts)