use squashed natvie and base commits