Fixing Mac's comments about Bob's merging