First test at branching and merging