conserve user branch when updating
fix old ancestors