merging with a more recent version of mezz