Branching and merging steps
Merge branch 'lab1'
Finish branching and merging steps
Merge branch 'lab1'