Bad branching/commits, catching up