Resolve merge conflicts.
Resolve merge conflicts.

craigsapp/minHumdrum,craigsapp/minHumdrum,craigsapp/minHumdrum,humdrum-tools/minHumdrum,craigsapp/humlib,craigsapp/humlib,craigsapp/humlib,humdrum-tools/minHumdrum,humdrum-tools/minHumdrum