Deprecation fix: replacing & with merge for relation merging
Merge pull request #1090 from elzj/merge_deprecation_fix

Deprecation fix: replacing & with merge for relation merging