more branching and merging