more re-doing git work