Finish branching and merging steps