fix for merge function signature change