Fix message on metadata ARGGH.
Merge pull request #228 from Martii/stragglersOnLastMergeConflict

Fix message on metadata ARGGH.