Fix modification of property sets when merging