Fix deprecation in merging