test branching and merging