Yes, that's true, merging. Which is what made branching a reasonable thing to do.