update branching/merging and beyond