@gregcaporaso can you move your new changelog line down to the bottom, and revert the changes to the parallel_merge_otus line? For this pull request, that should be the only modification to this file.