Changes in branch merging