Add callpath support to merging