fixed merging on manifest...i think