Testing branching and merging