Fix internal utils.merge deprecation warnings