fix some manifest merging