Replace & by and

Anticipating @hflynn's comment on my PR :)
Add extra option descriptions for the merge job and give example