Update bob.md

Adding the merging flow