fix divergent repo errors