manifest changes to take advantage of merging