not just a way to absorb merges from master